summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojtech Bocek <vbocek@gmail.com>2015-03-06 00:28:21 +0100
committerEthan Yonker <dees_troy@teamw.in>2015-03-11 14:01:30 +0100
commit3041c887f152dd60fbb234a1038e6283cbff0310 (patch)
tree410682906033d8e76e090881dc56c7a78bbe5f04
parentImplement gr_line() and gr_render_circle() (diff)
downloadandroid_bootable_recovery-3041c887f152dd60fbb234a1038e6283cbff0310.tar
android_bootable_recovery-3041c887f152dd60fbb234a1038e6283cbff0310.tar.gz
android_bootable_recovery-3041c887f152dd60fbb234a1038e6283cbff0310.tar.bz2
android_bootable_recovery-3041c887f152dd60fbb234a1038e6283cbff0310.tar.lz
android_bootable_recovery-3041c887f152dd60fbb234a1038e6283cbff0310.tar.xz
android_bootable_recovery-3041c887f152dd60fbb234a1038e6283cbff0310.tar.zst
android_bootable_recovery-3041c887f152dd60fbb234a1038e6283cbff0310.zip
Diffstat (limited to '')
-rw-r--r--minuitwrp/graphics.c8
-rw-r--r--minuitwrp/truetype.c3
2 files changed, 9 insertions, 2 deletions
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);
diff --git a/minuitwrp/truetype.c b/minuitwrp/truetype.c
index 998ab45dd..db70236a4 100644
--- a/minuitwrp/truetype.c
+++ b/minuitwrp/truetype.c
@@ -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;