diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/modules/engines/software_generic/evas_engine.c | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to 'libraries/evas/src/modules/engines/software_generic/evas_engine.c')
-rw-r--r-- | libraries/evas/src/modules/engines/software_generic/evas_engine.c | 24 |
1 files changed, 10 insertions, 14 deletions
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); |