diff --git a/Externals/GL/GL/gl.h b/Externals/GL/GL/gl.h index 2fc15b815d..31d6d8325b 100644 --- a/Externals/GL/GL/gl.h +++ b/Externals/GL/GL/gl.h @@ -1629,6 +1629,7 @@ typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, #define GL_FUNC_REVERSE_SUBTRACT 0x800B #define GL_BLEND_COLOR 0x8005 +#ifdef GL_GLEXT_PROTOTYPES GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, @@ -1738,7 +1739,7 @@ GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target, GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span ); - +#endif /* @@ -1850,6 +1851,8 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format, /* texture_border_clamp */ #define GL_CLAMP_TO_BORDER 0x812D +#ifdef GL_GLEXT_PROTOTYPES + GLAPI void GLAPIENTRY glActiveTexture( GLenum texture ); GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture ); @@ -1943,6 +1946,7 @@ GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] ); GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert ); +#endif typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index bdf018bddf..958931af71 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -15,7 +15,7 @@ PFNGLTEXIMAGE3DPROC glTexImage3D; PFNGLTEXSUBIMAGE3DPROC glTexSubImage3D; // gl_1_3 -/*PFNGLACTIVETEXTUREPROC glActiveTexture; +PFNGLACTIVETEXTUREPROC glActiveTexture; PFNGLCLIENTACTIVETEXTUREPROC glClientActiveTexture; PFNGLCOMPRESSEDTEXIMAGE1DPROC glCompressedTexImage1D; PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2D; @@ -61,10 +61,10 @@ PFNGLMULTITEXCOORD4IVPROC glMultiTexCoord4iv; PFNGLMULTITEXCOORD4SPROC glMultiTexCoord4s; PFNGLMULTITEXCOORD4SVPROC glMultiTexCoord4sv; PFNGLSAMPLECOVERAGEPROC glSampleCoverage; -*/ + // gl_1_4 -//PFNGLBLENDCOLORPROC glBlendColor; -//PFNGLBLENDEQUATIONPROC glBlendEquation; +PFNGLBLENDCOLORPROC glBlendColor; +PFNGLBLENDEQUATIONPROC glBlendEquation; PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate; PFNGLFOGCOORDPOINTERPROC glFogCoordPointer; PFNGLFOGCOORDDPROC glFogCoordd; @@ -439,7 +439,7 @@ namespace GLExtensions std::unordered_map _extensionlist; // Forward declared init functions bool init_gl_1_2(); - // bool init_gl_1_3(); + bool init_gl_1_3(); bool init_gl_1_4(); bool init_gl_1_5(); bool init_gl_2_0(); @@ -542,7 +542,7 @@ namespace GLExtensions InitVersion(); if (success && !init_gl_1_2()) success = false; - //if (success && !init_gl_1_3()) success = false; + if (success && !init_gl_1_3()) success = false; if (success && !init_gl_1_4()) success = false; if (success && !init_gl_1_5()) success = false; if (success && !init_gl_2_0()) success = false; @@ -593,7 +593,7 @@ namespace GLExtensions && GrabFunction(glTexImage3D) && GrabFunction(glTexSubImage3D); } - /* + bool init_gl_1_3() { return GrabFunction(glActiveTexture) @@ -643,12 +643,12 @@ namespace GLExtensions && GrabFunction(glMultiTexCoord4sv) && GrabFunction(glSampleCoverage); } - */ + bool init_gl_1_4() { - //GrabFunction(glBlendColor) - //GrabFunction(glBlendEquation) - return GrabFunction(glBlendFuncSeparate) + return GrabFunction(glBlendColor) + && GrabFunction(glBlendEquation) + && GrabFunction(glBlendFuncSeparate) && GrabFunction(glFogCoordPointer) && GrabFunction(glFogCoordd) && GrabFunction(glFogCoorddv) diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h index 37852c4f84..ffd3fd7ba9 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h @@ -7,6 +7,7 @@ #include "GLInterface.h" #include "gl_1_2.h" +#include "gl_1_3.h" #include "gl_1_4.h" #include "gl_1_5.h" #include "gl_2_0.h" diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h index 735fea7de8..105a5215c4 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h @@ -98,8 +98,8 @@ typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVPROC) (const GLshort *p); #endif // These two are provided by ARB_imaging as well -//extern PFNGLBLENDCOLORPROC glBlendColor; -//extern PFNGLBLENDEQUATIONPROC glBlendEquation; +extern PFNGLBLENDCOLORPROC glBlendColor; +extern PFNGLBLENDEQUATIONPROC glBlendEquation; extern PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate; extern PFNGLFOGCOORDPOINTERPROC glFogCoordPointer; extern PFNGLFOGCOORDDPROC glFogCoordd;