From 017e26b4e0fed7507c5c27cf06b9eb61e0189ae8 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 13 Oct 2009 10:42:03 +0000 Subject: [PATCH] fix font aligned tex. SVN revision: 43049 --- legacy/evas/src/modules/engines/gl_common/evas_gl_font.c | 2 +- legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_font.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_font.c index ee2756460e..4d622e366e 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_font.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_font.c @@ -19,7 +19,7 @@ evas_gl_font_texture_new(Evas_GL_Context *gc, RGBA_Font_Glyph *fg) j = fg->glyph_out->bitmap.pitch; if (j < w) j = w; - nw = w; + nw = ((w + 3) / 4) * 4; ndata = alloca(nw *h); if (!ndata) return NULL; if (fg->glyph_out->bitmap.num_grays == 256) diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c index 6aa936bff0..25b8223263 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c @@ -350,15 +350,13 @@ evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels, int w, #ifdef GL_UNPACK_ROW_LENGTH glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); #endif - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); glTexSubImage2D(GL_TEXTURE_2D, 0, tex->x, tex->y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, pixels); if (tex->pt->texture != tex->gc->shader.cur_tex) - { - glBindTexture(GL_TEXTURE_2D, tex->gc->shader.cur_tex); - } + glBindTexture(GL_TEXTURE_2D, tex->gc->shader.cur_tex); } Evas_GL_Texture *