commit b11d50936e6224b6ca78b413bbb6ba55b6c06200
author Ryan C. Gordon <icculus@icculus.org> Mon Feb 04 18:55:39 2019 -0500
committer Ryan C. Gordon <icculus@icculus.org> Mon Feb 04 18:55:39 2019 -0500
tree 2b02c630cc2d81ccc18b62b05c7417ce0a36163c
parent 8feff262f255eed0220fca47d53b0b0fa81006f0

render: Fix OpenGL draw state cache for various points of texture binding.

src/render/opengl/SDL_render_gl.c

diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index e2c9a1c..81da888 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -443,6 +443,8 @@
 
     GL_ActivateRenderer(renderer);
 
+    renderdata->drawstate.texture = NULL;  /* we trash this state. */
+
     if (texture->access == SDL_TEXTUREACCESS_TARGET &&
         !renderdata->GL_EXT_framebuffer_object_supported) {
         return SDL_SetError("Render targets not supported by OpenGL");
@@ -641,6 +643,8 @@
 
     GL_ActivateRenderer(renderer);
 
+    renderdata->drawstate.texture = NULL;  /* we trash this state. */
+
     renderdata->glEnable(textype);
     renderdata->glBindTexture(textype, data->texture);
     renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -702,6 +706,8 @@
 
     GL_ActivateRenderer(renderer);
 
+    renderdata->drawstate.texture = NULL;  /* we trash this state. */
+
     renderdata->glEnable(textype);
     renderdata->glBindTexture(textype, data->texture);
     renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@ -1469,6 +1475,9 @@
     }
     data->glBindTexture(textype, texturedata->texture);
 
+    data->drawstate.texturing = SDL_TRUE;
+    data->drawstate.texture = texture;
+
     if(texw) *texw = (float)texturedata->texw;
     if(texh) *texh = (float)texturedata->texh;
 
@@ -1496,6 +1505,9 @@
 
     data->glDisable(textype);
 
+    data->drawstate.texturing = SDL_FALSE;
+    data->drawstate.texture = NULL;
+
     return 0;
 }