From a42cde0837598afee01ea0cc6df6d1027e194362 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 11 May 2014 09:17:18 +0200 Subject: [PATCH] - removed #include of glxew.h because it's not used. - removed some unused functions from gl_interface.cpp which were causing problems when compiling on Linux. --- src/gl/system/gl_interface.cpp | 37 ---------------------------------- src/gl/system/gl_system.h | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/gl/system/gl_interface.cpp b/src/gl/system/gl_interface.cpp index 2d311f0bb..214702566 100644 --- a/src/gl/system/gl_interface.cpp +++ b/src/gl/system/gl_interface.cpp @@ -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 -#define wglGetProcAddress(x) (*SDL_GL_GetProcAddress)(x) -#endif -static void APIENTRY glBlendEquationDummy (GLenum mode); - - static TArray 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; -} - //========================================================================== // @@ -235,26 +218,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}; diff --git a/src/gl/system/gl_system.h b/src/gl/system/gl_system.h index cb98d572e..8140904a2 100644 --- a/src/gl/system/gl_system.h +++ b/src/gl/system/gl_system.h @@ -72,7 +72,7 @@ #if defined(__APPLE__) #include #elif defined(__unix__) - #include + //#include #else // !__APPLE__ && !__unix__ #define DWORD WINDOWS_DWORD // I don't want to depend on this throughout the GL code! #include