diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-05 20:38:18 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-05 20:38:18 +0800 |
| commit | f19cb40115e3e35483d387c7e1c1bf3d119a33e5 (patch) | |
| tree | 892560d1d980bf77c0fffe263f105b446f0a4497 /indra/llrender | |
| parent | 4740db4a9935e4cc234342b9c19323afca03ae52 (diff) | |
Comment out redefinitions of GL functions
which are mostly ARB ones, and instead we define GLEXT prototypes to be
true so we still get access to the functions.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.cpp | 3 | ||||
| -rw-r--r-- | indra/llrender/llglheaders.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index e96a226115..68842c9692 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -162,6 +162,8 @@ std::list<LLGLUpdate*> LLGLUpdate::sGLQ; PFNGLGETSTRINGIPROC glGetStringi = NULL; #endif +/* + // vertex blending prototypes PFNGLWEIGHTPOINTERARBPROC glWeightPointerARB = NULL; PFNGLVERTEXBLENDARBPROC glVertexBlendARB = NULL; @@ -399,6 +401,7 @@ PFNGLACTIVETEXTUREARBPROC glActiveTextureARB = NULL; PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB = NULL; PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements = NULL; #endif // LL_LINUX_NV_GL_HEADERS +*/ #endif LLGLManager gGLManager; diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 3ad92ed20e..1a8b2f1a64 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -48,6 +48,7 @@ //---------------------------------------------------------------------------- // Linux, MESA headers, but not necessarily assuming MESA runtime. // quotes so we get libraries/.../GL/ version +#define GL_GLEXT_PROTOTYPES 1 #include "GL/gl.h" #include "GL/glext.h" #include "GL/glu.h" @@ -83,6 +84,8 @@ extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB; extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; #endif // LL_LINUX_NV_GL_HEADERS +/* + // GL_ARB_vertex_array_object extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray; extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays; @@ -307,6 +310,7 @@ extern PFNGLTRANSFORMFEEDBACKVARYINGSPROC glTransformFeedbackVaryings; extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange; extern PFNGLBINDBUFFERBASEPROC glBindBufferBase; +*/ #elif LL_WINDOWS //---------------------------------------------------------------------------- |