From: raster Date: Wed, 28 Apr 2010 05:14:02 +0000 (+0000) Subject: enable that stuff - shouldnt hurt to be explicit. X-Git-Tag: accepted/2.0/20130306.225542~242^2~1882 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=328ae06012dfbe1eb4959cd3cfa1ef6fbbc0fc0f;p=profile%2Fivi%2Fevas.git enable that stuff - shouldnt hurt to be explicit. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@48383 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/modules/engines/gl_common/evas_gl_context.c b/src/modules/engines/gl_common/evas_gl_context.c index 5ff095c..9cf420d 100644 --- a/src/modules/engines/gl_common/evas_gl_context.c +++ b/src/modules/engines/gl_common/evas_gl_context.c @@ -1181,16 +1181,18 @@ shader_array_flush(Evas_GL_Context *gc) if (gc->shader.cur_tex != gc->shader.current.cur_tex) { -// if (gc->shader.cur_tex) -// { -// glEnable(GL_TEXTURE_2D); -// GLERR(__FUNCTION__, __FILE__, __LINE__, ""); -// } -// else -// { -// glDisable(GL_TEXTURE_2D); -// GLERR(__FUNCTION__, __FILE__, __LINE__, ""); -// } +#if 1 + if (gc->shader.cur_tex) + { + glEnable(GL_TEXTURE_2D); + GLERR(__FUNCTION__, __FILE__, __LINE__, ""); + } + else + { + glDisable(GL_TEXTURE_2D); + GLERR(__FUNCTION__, __FILE__, __LINE__, ""); + } +#endif glActiveTexture(GL_TEXTURE0); GLERR(__FUNCTION__, __FILE__, __LINE__, ""); glBindTexture(GL_TEXTURE_2D, gc->shader.cur_tex);