zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Glew_Version_For_Real

This commit is contained in:
Christoph Oelckers 2014-05-11 09:17:46 +02:00
parent f7404d20fb a42cde0837
commit 92b9814460
2 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/gl/system/gl_interface.cpp
View File

@ -46,29 +46,12 @@
#include "gl/system/gl_interface.h"
#include "gl/system/gl_cvars.h"
#if defined (__unix__) || defined (__APPLE__)
#define PROC void*
#define LPCSTR const char*
#include <SDL.h>
#define wglGetProcAddress(x) (*SDL_GL_GetProcAddress)(x)
#endif
static void APIENTRY glBlendEquationDummy (GLenum mode);
static TArray<FString> m_Extensions;
RenderContext gl;
int occlusion_type=0;
PROC myGetProcAddress(LPCSTR proc)
{
PROC p = wglGetProcAddress(proc);
if (p == NULL) I_Error("Fatal: GL function '%s' not found.", proc);
return p;
}
//==========================================================================
//
@ -222,26 +205,6 @@ void gl_PrintStartupLog()
//
//==========================================================================
static void APIENTRY glBlendEquationDummy (GLenum mode)
{
// If this is not supported all non-existent modes are
// made to draw nothing.
if (mode == GL_FUNC_ADD)
{
glColorMask(true, true, true, true);
}
else
{
glColorMask(false, false, false, false);
}
}
//==========================================================================
//
//
//
//==========================================================================
void gl_SetTextureMode(int type)
{
static float white[] = {1.f,1.f,1.f,1.f};

2
src/gl/system/gl_system.h
View File

@ -72,7 +72,7 @@
#if defined(__APPLE__)
#include <OpenGL/OpenGL.h>
#elif defined(__unix__)
#include <GL/glxew.h>
//#include <GL/glxew.h>
#else // !__APPLE__ && !__unix__
#define DWORD WINDOWS_DWORD // I don't want to depend on this throughout the GL code!
#include <GL/wglew.h>