diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/evas/src/modules/engines/gl_common | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/evas/src/modules/engines/gl_common')
3 files changed, 11 insertions, 6 deletions
diff --git a/libraries/evas/src/modules/engines/gl_common/Makefile.in b/libraries/evas/src/modules/engines/gl_common/Makefile.in index 61ed478..27284f9 100644 --- a/libraries/evas/src/modules/engines/gl_common/Makefile.in +++ b/libraries/evas/src/modules/engines/gl_common/Makefile.in | |||
@@ -245,8 +245,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
245 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 245 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
246 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 246 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
247 | PKG_CONFIG = @PKG_CONFIG@ | 247 | PKG_CONFIG = @PKG_CONFIG@ |
248 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
249 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
250 | PNG_CFLAGS = @PNG_CFLAGS@ | 248 | PNG_CFLAGS = @PNG_CFLAGS@ |
251 | PNG_LIBS = @PNG_LIBS@ | 249 | PNG_LIBS = @PNG_LIBS@ |
252 | RANLIB = @RANLIB@ | 250 | RANLIB = @RANLIB@ |
@@ -263,6 +261,8 @@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ | |||
263 | VALGRIND_LIBS = @VALGRIND_LIBS@ | 261 | VALGRIND_LIBS = @VALGRIND_LIBS@ |
264 | VERSION = @VERSION@ | 262 | VERSION = @VERSION@ |
265 | VMAJ = @VMAJ@ | 263 | VMAJ = @VMAJ@ |
264 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | ||
265 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | ||
266 | WIN32_CFLAGS = @WIN32_CFLAGS@ | 266 | WIN32_CFLAGS = @WIN32_CFLAGS@ |
267 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | 267 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ |
268 | XCB_CFLAGS = @XCB_CFLAGS@ | 268 | XCB_CFLAGS = @XCB_CFLAGS@ |
@@ -344,6 +344,10 @@ evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | |||
344 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 344 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
345 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 345 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
346 | evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@ | 346 | evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@ |
347 | evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@ | ||
348 | evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@ | ||
349 | evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@ | ||
350 | evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@ | ||
347 | evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@ | 351 | evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@ |
348 | evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@ | 352 | evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@ |
349 | evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@ | 353 | evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@ |
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_common.h b/libraries/evas/src/modules/engines/gl_common/evas_gl_common.h index a088748..051fb3b 100644 --- a/libraries/evas/src/modules/engines/gl_common/evas_gl_common.h +++ b/libraries/evas/src/modules/engines/gl_common/evas_gl_common.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #define GL_GLEXT_PROTOTYPES | 16 | #define GL_GLEXT_PROTOTYPES |
17 | 17 | ||
18 | #ifdef BUILD_ENGINE_GL_QUARTZ | 18 | #ifdef BUILD_ENGINE_GL_COCOA |
19 | # include <OpenGL/gl.h> | 19 | # include <OpenGL/gl.h> |
20 | # include <OpenGL/glext.h> | 20 | # include <OpenGL/glext.h> |
21 | #else | 21 | #else |
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++; |