mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-28 06:42:09 +00:00
- 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.
This commit is contained in:
parent
b09405a8bd
commit
a42cde0837
2 changed files with 1 additions and 38 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
|
@ -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};
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue