diff options
Diffstat (limited to '')
3 files changed, 16 insertions, 23 deletions
diff --git a/libraries/evas/src/modules/engines/software_generic/Makefile.am b/libraries/evas/src/modules/engines/software_generic/Makefile.am index d7986f1..e605dac 100644 --- a/libraries/evas/src/modules/engines/software_generic/Makefile.am +++ b/libraries/evas/src/modules/engines/software_generic/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @FREETYPE_CFLAGS@ \ | 10 | @FREETYPE_CFLAGS@ \ |
11 | @PIXMAN_CFLAGS@ | 11 | @PIXMAN_CFLAGS@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | SOFTWARE_GENERIC_SOURCES = evas_engine.c | 13 | SOFTWARE_GENERIC_SOURCES = evas_engine.c |
16 | 14 | ||
17 | 15 | ||
@@ -22,7 +20,7 @@ pkg_LTLIBRARIES = module.la | |||
22 | 20 | ||
23 | module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) | 21 | module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) |
24 | 22 | ||
25 | module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la | 23 | module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la |
26 | module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version | 24 | module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version |
27 | module_la_LIBTOOLFLAGS = --tag=disable-static | 25 | module_la_LIBTOOLFLAGS = --tag=disable-static |
28 | 26 | ||
diff --git a/libraries/evas/src/modules/engines/software_generic/Makefile.in b/libraries/evas/src/modules/engines/software_generic/Makefile.in index 4f66536..fe0ac3d 100644 --- a/libraries/evas/src/modules/engines/software_generic/Makefile.in +++ b/libraries/evas/src/modules/engines/software_generic/Makefile.in | |||
@@ -186,6 +186,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
186 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 186 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
187 | EVIL_LIBS = @EVIL_LIBS@ | 187 | EVIL_LIBS = @EVIL_LIBS@ |
188 | EXEEXT = @EXEEXT@ | 188 | EXEEXT = @EXEEXT@ |
189 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
190 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
189 | FGREP = @FGREP@ | 191 | FGREP = @FGREP@ |
190 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 192 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
191 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 193 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -236,6 +238,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
236 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 238 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
237 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 239 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
238 | PKG_CONFIG = @PKG_CONFIG@ | 240 | PKG_CONFIG = @PKG_CONFIG@ |
241 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
242 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
239 | PNG_CFLAGS = @PNG_CFLAGS@ | 243 | PNG_CFLAGS = @PNG_CFLAGS@ |
240 | PNG_LIBS = @PNG_LIBS@ | 244 | PNG_LIBS = @PNG_LIBS@ |
241 | RANLIB = @RANLIB@ | 245 | RANLIB = @RANLIB@ |
@@ -254,8 +258,6 @@ VERSION = @VERSION@ | |||
254 | VMAJ = @VMAJ@ | 258 | VMAJ = @VMAJ@ |
255 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 259 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
256 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 260 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
257 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
258 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
259 | XCB_CFLAGS = @XCB_CFLAGS@ | 261 | XCB_CFLAGS = @XCB_CFLAGS@ |
260 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 262 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
261 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 263 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -329,8 +331,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
329 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 331 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
330 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 332 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
331 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 333 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
332 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
333 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
334 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 334 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
335 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 335 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
336 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 336 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -423,12 +423,11 @@ AM_CPPFLAGS = \ | |||
423 | @FREETYPE_CFLAGS@ \ | 423 | @FREETYPE_CFLAGS@ \ |
424 | @PIXMAN_CFLAGS@ | 424 | @PIXMAN_CFLAGS@ |
425 | 425 | ||
426 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
427 | SOFTWARE_GENERIC_SOURCES = evas_engine.c | 426 | SOFTWARE_GENERIC_SOURCES = evas_engine.c |
428 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) | 427 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) |
429 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkg_LTLIBRARIES = module.la | 428 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkg_LTLIBRARIES = module.la |
430 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) | 429 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) |
431 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la | 430 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la |
432 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version | 431 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version |
433 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static | 432 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static |
434 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@noinst_LTLIBRARIES = libevas_engine_software_generic.la | 433 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@noinst_LTLIBRARIES = libevas_engine_software_generic.la |
diff --git a/libraries/evas/src/modules/engines/software_generic/evas_engine.c b/libraries/evas/src/modules/engines/software_generic/evas_engine.c index 48944dd..4667f6b 100644 --- a/libraries/evas/src/modules/engines/software_generic/evas_engine.c +++ b/libraries/evas/src/modules/engines/software_generic/evas_engine.c | |||
@@ -591,11 +591,8 @@ eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r | |||
591 | } | 591 | } |
592 | 592 | ||
593 | static void | 593 | static void |
594 | eng_image_border_get(void *data __UNUSED__, void *image, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) | 594 | eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) |
595 | { | 595 | { |
596 | RGBA_Image *im; | ||
597 | |||
598 | im = image; | ||
599 | } | 596 | } |
600 | 597 | ||
601 | static char * | 598 | static char * |
@@ -704,18 +701,16 @@ eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h) | |||
704 | static void * | 701 | static void * |
705 | eng_image_size_set(void *data __UNUSED__, void *image, int w, int h) | 702 | eng_image_size_set(void *data __UNUSED__, void *image, int w, int h) |
706 | { | 703 | { |
707 | Image_Entry *im; | 704 | Image_Entry *im = image; |
708 | 705 | if (!im) return NULL; | |
709 | im = image; | 706 | return evas_cache_image_size_set(im, w, h); |
710 | return evas_cache_image_size_set(image, w, h); | ||
711 | } | 707 | } |
712 | 708 | ||
713 | static void * | 709 | static void * |
714 | eng_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h) | 710 | eng_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h) |
715 | { | 711 | { |
716 | Image_Entry *im = image; | 712 | Image_Entry *im = image; |
717 | 713 | if (!im) return NULL; | |
718 | if (!image) return NULL; | ||
719 | return evas_cache_image_dirty(im, x, y, w, h); | 714 | return evas_cache_image_dirty(im, x, y, w, h); |
720 | } | 715 | } |
721 | 716 | ||
@@ -931,11 +926,10 @@ static void * | |||
931 | eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) | 926 | eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) |
932 | { | 927 | { |
933 | void *surface; | 928 | void *surface; |
934 | DATA32 *pixels; | ||
935 | surface = evas_cache_image_copied_data(evas_common_image_cache_get(), | 929 | surface = evas_cache_image_copied_data(evas_common_image_cache_get(), |
936 | w, h, NULL, alpha, | 930 | w, h, NULL, alpha, |
937 | EVAS_COLORSPACE_ARGB8888); | 931 | EVAS_COLORSPACE_ARGB8888); |
938 | pixels = evas_cache_image_pixels(surface); | 932 | evas_cache_image_pixels(surface); |
939 | return surface; | 933 | return surface; |
940 | } | 934 | } |
941 | 935 | ||
@@ -1784,6 +1778,7 @@ static Evas_Func func = | |||
1784 | NULL, // need software mesa for gl rendering <- gl_proc_address_get | 1778 | NULL, // need software mesa for gl rendering <- gl_proc_address_get |
1785 | NULL, // need software mesa for gl rendering <- gl_native_surface_get | 1779 | NULL, // need software mesa for gl rendering <- gl_native_surface_get |
1786 | NULL, // need software mesa for gl rendering <- gl_api_get | 1780 | NULL, // need software mesa for gl rendering <- gl_api_get |
1781 | NULL, // need software mesa for gl rendering <- gl_img_obj_set | ||
1787 | eng_image_load_error_get, | 1782 | eng_image_load_error_get, |
1788 | eng_font_run_font_end_get, | 1783 | eng_font_run_font_end_get, |
1789 | eng_image_animated_get, | 1784 | eng_image_animated_get, |
@@ -2519,7 +2514,7 @@ evgl_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLi | |||
2519 | 2514 | ||
2520 | 2515 | ||
2521 | static void | 2516 | static void |
2522 | evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision) | 2517 | evgl_glGetShaderPrecisionFormat(GLenum shadertype __UNUSED__, GLenum precisiontype __UNUSED__, GLint* range, GLint* precision) |
2523 | { | 2518 | { |
2524 | if (range) | 2519 | if (range) |
2525 | { | 2520 | { |
@@ -2531,7 +2526,6 @@ evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* | |||
2531 | precision[0] = 24; // floor(-log2((1.0/16777218.0))); | 2526 | precision[0] = 24; // floor(-log2((1.0/16777218.0))); |
2532 | } | 2527 | } |
2533 | return; | 2528 | return; |
2534 | shadertype = precisiontype = 0; | ||
2535 | } | 2529 | } |
2536 | 2530 | ||
2537 | static void | 2531 | static void |
@@ -2567,6 +2561,8 @@ override_gl_apis(Evas_GL_API *api) | |||
2567 | ORD(glAttachShader); | 2561 | ORD(glAttachShader); |
2568 | ORD(glBindAttribLocation); | 2562 | ORD(glBindAttribLocation); |
2569 | ORD(glBindBuffer); | 2563 | ORD(glBindBuffer); |
2564 | ORD(glBindFramebuffer); | ||
2565 | ORD(glBindRenderbuffer); | ||
2570 | ORD(glBindTexture); | 2566 | ORD(glBindTexture); |
2571 | ORD(glBlendColor); | 2567 | ORD(glBlendColor); |
2572 | ORD(glBlendEquation); | 2568 | ORD(glBlendEquation); |