commit 3041c887f152dd60fbb234a1038e6283cbff0310
author Vojtech Bocek <vbocek@gmail.com> Fri Mar 06 00:28:21 2015 +0100
committer Ethan Yonker <dees_troy@teamw.in> Wed Mar 11 08:01:30 2015 -0500
tree 410682906033d8e76e090881dc56c7a78bbe5f04
parent db378b6cbb00296a9032aa8fc8a47961f6fced68

Properly disable GGL_TEXTURE_2D after using it in minuitwrp

Change-Id: Ib100ccf3c8f6c622beb40b37ba3f61aad69d7d93
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>

minuitwrp/graphics.c

diff --git a/minuitwrp/graphics.c b/minuitwrp/graphics.c
index 0772110..10d74a7 100644
--- a/minuitwrp/graphics.c
+++ b/minuitwrp/graphics.c
@@ -466,6 +466,8 @@
         }
     }
 
+    gl->disable(gl, GGL_TEXTURE_2D);
+
     return x;
 }
 
@@ -508,6 +510,8 @@
         }
     }
 
+    gl->disable(gl, GGL_TEXTURE_2D);
+
     return x;
 }
 
@@ -555,6 +559,8 @@
         }
     }
 
+    gl->disable(gl, GGL_TEXTURE_2D);
+
     return x;
 }
 
@@ -579,7 +585,6 @@
     if(gr_is_curr_clr_opaque)
         gl->disable(gl, GGL_BLEND);
 
-    gl->disable(gl, GGL_TEXTURE_2D);
     gl->recti(gl, x, y, x + w, y + h);
 
     if(gr_is_curr_clr_opaque)
@@ -649,6 +654,7 @@
     gl->enable(gl, GGL_TEXTURE_2D);
     gl->texCoord2i(gl, sx - dx, sy - dy);
     gl->recti(gl, dx, dy, dx + w, dy + h);
+    gl->disable(gl, GGL_TEXTURE_2D);
 
     if(surface->format == GGL_PIXEL_FORMAT_RGBX_8888)
         gl->enable(gl, GGL_BLEND);

minuitwrp/truetype.c

diff --git a/minuitwrp/truetype.c b/minuitwrp/truetype.c
index 998ab45..db70236 100644
--- a/minuitwrp/truetype.c
+++ b/minuitwrp/truetype.c
@@ -663,10 +663,11 @@
     gl->texEnvi(gl, GGL_TEXTURE_ENV, GGL_TEXTURE_ENV_MODE, GGL_REPLACE);
     gl->texGeni(gl, GGL_S, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE);
     gl->texGeni(gl, GGL_T, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE);
-    gl->enable(gl, GGL_TEXTURE_2D);
 
+    gl->enable(gl, GGL_TEXTURE_2D);
     gl->texCoord2i(gl, -x, -y);
     gl->recti(gl, x, y, x + e->surface.width, y_bottom);
+    gl->disable(gl, GGL_TEXTURE_2D);
 
     pthread_mutex_unlock(&font->mutex);
     return res;