PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly disable GGL_TEXTURE_2D after using it in minuitwrp

Browse Source 
Change-Id: Ib100ccf3c8f6c622beb40b37ba3f61aad69d7d93
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
This commit is contained in:
Vojtech Bocek
2015-03-06 00:28:21 +01:00
committed by Ethan Yonker
parent db378b6cbb
commit 3041c887f1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minuitwrp/graphics.c
+7 -1
View File
@@ -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);
minuitwrp/truetype.c
+2 -1
View File
@@ -663,10 +663,11 @@ int gr_ttf_textExWH(void *context, int x, int y, const char *s, void *pFont, int
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;