enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

oh my bad! i broke desktop gl compilation! bad bad bad me. spank! fix. 

SVN revision: 62777
This commit is contained in:
Carsten Haitzler 2011-08-25 05:17:43 +00:00
parent 4b59fd460e
commit 5cc90f00d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c
View File

@ -348,7 +348,7 @@ _pool_tex_render_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, in
pt->h = h;
pt->intformat = intformat;
pt->format = format;
if (intformat == rgba8_ifmt && format == rgba8_fmt)
if ((intformat == (int)rgba8_ifmt) && (format == (int)rgba8_fmt))
pt->dataformat = GL_UNSIGNED_INT_8_8_8_8_REV;
else
pt->dataformat = GL_UNSIGNED_BYTE;
@ -568,17 +568,18 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i
return pt;
/* ERROR HANDLING */
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
error:
secsym_eglDestroyImage(egldisplay, pt->dyn.img);
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
pt->dyn.img = NULL;
glBindTexture(GL_TEXTURE_2D, 0);
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
glDeleteTextures(1, &(pt->texture));
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
free(pt);
return NULL;
#endif
}
void