piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

[GLExtensions] Dynamically pull in the GL 1.3 and 1.4 functions as well.

Browse Source
This commit is contained in:
Ryan Houdek
2013-12-30 16:34:28 -06:00
committed by degasus
parent d5a7ea2041
commit 10bd61a9d2
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
View File

@ -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<std::string, bool> _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)