From 3041c887f152dd60fbb234a1038e6283cbff0310 Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Fri, 6 Mar 2015 00:28:21 +0100 Subject: Properly disable GGL_TEXTURE_2D after using it in minuitwrp Change-Id: Ib100ccf3c8f6c622beb40b37ba3f61aad69d7d93 Signed-off-by: Vojtech Bocek --- minuitwrp/graphics.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'minuitwrp/graphics.c') diff --git a/minuitwrp/graphics.c b/minuitwrp/graphics.c index 077211064..10d74a7a7 100644 --- a/minuitwrp/graphics.c +++ b/minuitwrp/graphics.c @@ -466,6 +466,8 @@ int gr_textEx(int x, int y, const char *s, void* pFont) } } + gl->disable(gl, GGL_TEXTURE_2D); + return x; } @@ -508,6 +510,8 @@ int gr_textExW(int x, int y, const char *s, void* pFont, int max_width) } } + gl->disable(gl, GGL_TEXTURE_2D); + return x; } @@ -555,6 +559,8 @@ int gr_textExWH(int x, int y, const char *s, void* pFont, int max_width, int max } } + gl->disable(gl, GGL_TEXTURE_2D); + return x; } @@ -579,7 +585,6 @@ void gr_fill(int x, int y, int w, int h) 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 @@ void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy) { 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); -- cgit v1.2.3