enable that stuff - shouldnt hurt to be explicit.

SVN revision: 48383
This commit is contained in:
Carsten Haitzler 2010-04-28 05:14:02 +00:00
parent a0b2235a44
commit c4e6db910d
1 changed files with 12 additions and 10 deletions

View File

@ -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);