ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OpenGL Renderer: 

- Use ARB version of glActiveTexture() to improve backwards compatibility.
This commit is contained in:
rogerman 2013-01-26 22:04:32 +00:00
parent 02d131a365
commit a340c63734
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
desmume/src/OGLRender.cpp
View File

@ -253,7 +253,7 @@ static void ENDGL() {
//------------------------------------------------------------ //------------------------------------------------------------
// Textures // Textures
OGLEXT(PFNGLACTIVETEXTUREPROC, glActiveTexture) OGLEXT(PFNGLACTIVETEXTUREARBPROC, glActiveTextureARB)
// Blending // Blending
OGLEXT(PFNGLBLENDFUNCSEPARATEEXTPROC, glBlendFuncSeparateEXT) OGLEXT(PFNGLBLENDFUNCSEPARATEEXTPROC, glBlendFuncSeparateEXT)
@ -319,7 +319,7 @@ OGLEXT(PFNGLDELETERENDERBUFFERSEXTPROC, glDeleteRenderbuffersEXT)
static void OGLInitFunctions(const char *oglExtensionString) static void OGLInitFunctions(const char *oglExtensionString)
{ {
// Textures // Textures
INITOGLEXT(PFNGLACTIVETEXTUREPROC, glActiveTexture) INITOGLEXT(PFNGLACTIVETEXTUREARBPROC, glActiveTextureARB)
// Blending // Blending
INITOGLEXT(PFNGLBLENDFUNCSEPARATEEXTPROC, glBlendFuncSeparateEXT) INITOGLEXT(PFNGLBLENDFUNCSEPARATEEXTPROC, glBlendFuncSeparateEXT)
@ -700,7 +700,7 @@ static bool OGLInitShaders(const char *oglExtensionString)
// The toon table is a special 1D texture where each pixel corresponds // The toon table is a special 1D texture where each pixel corresponds
// to a specific color in the toon table. // to a specific color in the toon table.
glGenTextures(1, &texToonTableID); glGenTextures(1, &texToonTableID);
glActiveTexture(GL_TEXTURE0 + OGLTextureUnitID_ToonTable); glActiveTextureARB(GL_TEXTURE0_ARB + OGLTextureUnitID_ToonTable);
glBindTexture(GL_TEXTURE_1D, texToonTableID); glBindTexture(GL_TEXTURE_1D, texToonTableID);
glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -708,7 +708,7 @@ static bool OGLInitShaders(const char *oglExtensionString)
glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glBindTexture(GL_TEXTURE_1D, 0); glBindTexture(GL_TEXTURE_1D, 0);
glActiveTexture(GL_TEXTURE0); glActiveTextureARB(GL_TEXTURE0_ARB);
memset(currentToonTable16, 0, sizeof(currentToonTable16)); memset(currentToonTable16, 0, sizeof(currentToonTable16));
toonTableNeedsUpdate = true; toonTableNeedsUpdate = true;
@ -817,7 +817,7 @@ static bool OGLInitFBOs(const char *oglExtensionString)
glGenTextures(1, &texClearImageColorID); glGenTextures(1, &texClearImageColorID);
glGenTextures(1, &texClearImageDepthStencilID); glGenTextures(1, &texClearImageDepthStencilID);
glActiveTexture(GL_TEXTURE0 + OGLTextureUnitID_ClearImage); glActiveTextureARB(GL_TEXTURE0_ARB + OGLTextureUnitID_ClearImage);
glBindTexture(GL_TEXTURE_2D, texClearImageColorID); glBindTexture(GL_TEXTURE_2D, texClearImageColorID);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -834,7 +834,7 @@ static bool OGLInitFBOs(const char *oglExtensionString)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_NONE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_NONE);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, 256, 192, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, NULL); glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, 256, 192, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, NULL);
glActiveTexture(GL_TEXTURE0); glActiveTextureARB(GL_TEXTURE0_ARB);
// Set up FBOs // Set up FBOs
glGenFramebuffersEXT(1, &fboClearImageID); glGenFramebuffersEXT(1, &fboClearImageID);
@ -1325,8 +1325,9 @@ static void OGLClose()
glDeleteShader(vertexShaderID); glDeleteShader(vertexShaderID);
glDeleteShader(fragmentShaderID); glDeleteShader(fragmentShaderID);
glActiveTexture(GL_TEXTURE0 + OGLTextureUnitID_ToonTable); glActiveTextureARB(GL_TEXTURE0_ARB + OGLTextureUnitID_ToonTable);
glBindTexture(GL_TEXTURE_1D, 0); glBindTexture(GL_TEXTURE_1D, 0);
glActiveTextureARB(GL_TEXTURE0_ARB);
glDeleteTextures(1, &texToonTableID); glDeleteTextures(1, &texToonTableID);
isShaderSupported = false; isShaderSupported = false;
@ -1363,8 +1364,9 @@ static void OGLClose()
// FBO // FBO
if (isFBOSupported) if (isFBOSupported)
{ {
glActiveTexture(GL_TEXTURE0 + OGLTextureUnitID_ClearImage); glActiveTextureARB(GL_TEXTURE0_ARB + OGLTextureUnitID_ClearImage);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glActiveTextureARB(GL_TEXTURE0_ARB);
glBindFramebufferEXT(GL_FRAMEBUFFER, 0); glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
glDeleteFramebuffersEXT(1, &fboClearImageID); glDeleteFramebuffersEXT(1, &fboClearImageID);
@ -1388,7 +1390,6 @@ static void OGLClose()
//kill the tex cache to free all the texture ids //kill the tex cache to free all the texture ids
TexCache_Reset(); TexCache_Reset();
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
while(!freeTextureIds.empty()) while(!freeTextureIds.empty())
@ -1428,7 +1429,6 @@ static void SetupTexture(const POLY *thePoly)
if (hasTexture) if (hasTexture)
{ {
hasTexture = false; hasTexture = false;
glActiveTexture(GL_TEXTURE0);
if (isShaderSupported) if (isShaderSupported)
{ {
@ -1447,7 +1447,6 @@ static void SetupTexture(const POLY *thePoly)
if (!hasTexture) if (!hasTexture)
{ {
hasTexture = true; hasTexture = true;
glActiveTexture(GL_TEXTURE0);
if (isShaderSupported) if (isShaderSupported)
{ {
@ -1621,10 +1620,10 @@ static void SetupPolygon(const POLY *thePoly)
// Update the toon table if necessary // Update the toon table if necessary
if (toonTableNeedsUpdate && attr.polygonMode == 2) if (toonTableNeedsUpdate && attr.polygonMode == 2)
{ {
glActiveTexture(GL_TEXTURE0 + OGLTextureUnitID_ToonTable); glActiveTextureARB(GL_TEXTURE0_ARB + OGLTextureUnitID_ToonTable);
glBindTexture(GL_TEXTURE_1D, texToonTableID); glBindTexture(GL_TEXTURE_1D, texToonTableID);
glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 32, 0, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, currentToonTable16); glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 32, 0, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, currentToonTable16);
glActiveTexture(GL_TEXTURE0); glActiveTextureARB(GL_TEXTURE0_ARB);
toonTableNeedsUpdate = false; toonTableNeedsUpdate = false;
} }
@ -1805,7 +1804,7 @@ static void HandleClearImage()
} }
// Upload color pixels and depth buffer // Upload color pixels and depth buffer
glActiveTexture(GL_TEXTURE0 + OGLTextureUnitID_ClearImage); glActiveTextureARB(GL_TEXTURE0_ARB + OGLTextureUnitID_ClearImage);
glBindTexture(GL_TEXTURE_2D, texClearImageColorID); glBindTexture(GL_TEXTURE_2D, texClearImageColorID);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, pixelsPerLine, lineCount, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, oglClearImageColor); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, pixelsPerLine, lineCount, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, oglClearImageColor);
@ -1813,7 +1812,7 @@ static void HandleClearImage()
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, pixelsPerLine, lineCount, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, oglClearImageDepth); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, pixelsPerLine, lineCount, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, oglClearImageDepth);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE0); glActiveTextureARB(GL_TEXTURE0_ARB);
} }
// Copy the clear image to the main framebuffer // Copy the clear image to the main framebuffer