diff options
Diffstat (limited to 'libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c')
-rw-r--r-- | libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c index c99f4bd..8162cd1 100644 --- a/libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c +++ b/libraries/evas/src/modules/engines/gl_common/evas_gl_texture.c | |||
@@ -109,7 +109,9 @@ _tex_format_index(GLuint format) | |||
109 | static void | 109 | static void |
110 | _tex_2d(int intfmt, int w, int h, int fmt, int type) | 110 | _tex_2d(int intfmt, int w, int h, int fmt, int type) |
111 | { | 111 | { |
112 | #ifdef GL_TEXTURE_INTERNAL_FORMAT | ||
112 | int intfmtret = -1; | 113 | int intfmtret = -1; |
114 | #endif | ||
113 | glTexImage2D(GL_TEXTURE_2D, 0, intfmt, w, h, 0, fmt, type, NULL); | 115 | glTexImage2D(GL_TEXTURE_2D, 0, intfmt, w, h, 0, fmt, type, NULL); |
114 | GLERR(__FUNCTION__, __FILE__, __LINE__, ""); | 116 | GLERR(__FUNCTION__, __FILE__, __LINE__, ""); |
115 | #ifdef GL_TEXTURE_INTERNAL_FORMAT | 117 | #ifdef GL_TEXTURE_INTERNAL_FORMAT |
@@ -479,7 +481,6 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i | |||
479 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | 481 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) |
480 | int fmt; // EGL_MAP_GL_TEXTURE_RGBA_SEC or EGL_MAP_GL_TEXTURE_RGB_SEC or bust | 482 | int fmt; // EGL_MAP_GL_TEXTURE_RGBA_SEC or EGL_MAP_GL_TEXTURE_RGB_SEC or bust |
481 | int pixtype; // EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC or bust | 483 | int pixtype; // EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC or bust |
482 | int glformat; | ||
483 | int attr[] = | 484 | int attr[] = |
484 | { | 485 | { |
485 | EGL_MAP_GL_TEXTURE_WIDTH_SEC, 32, | 486 | EGL_MAP_GL_TEXTURE_WIDTH_SEC, 32, |
@@ -914,7 +915,7 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im) | |||
914 | tpix = alloca(im->cache_entry.h * sizeof(DATA32)); | 915 | tpix = alloca(im->cache_entry.h * sizeof(DATA32)); |
915 | pd = tpix; | 916 | pd = tpix; |
916 | ps = im->image.data; | 917 | ps = im->image.data; |
917 | for (i = 0; i < im->cache_entry.h; i++) | 918 | for (i = 0; i < (int)im->cache_entry.h; i++) |
918 | { | 919 | { |
919 | *pd = *ps; | 920 | *pd = *ps; |
920 | pd++; | 921 | pd++; |
@@ -929,7 +930,7 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im) | |||
929 | tpix); | 930 | tpix); |
930 | pd = tpix; | 931 | pd = tpix; |
931 | ps = im->image.data + (im->cache_entry.w - 1); | 932 | ps = im->image.data + (im->cache_entry.w - 1); |
932 | for (i = 0; i < im->cache_entry.h; i++) | 933 | for (i = 0; i < (int)im->cache_entry.h; i++) |
933 | { | 934 | { |
934 | *pd = *ps; | 935 | *pd = *ps; |
935 | pd++; | 936 | pd++; |