summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-01-21 12:43:53 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-01-21 12:43:53 +0000
commit33ba2279fcf0e6bcc022d4dae0715a2cd12cb0e7 (patch)
treed0686a70f478c10feca7c14a6a1a0b428f3fc88d /legacy/evas/src/modules/engines/gl_x11/evas_engine.c
parentc30b3cacb5e950ce3b11fd833261fef6ffb6dc5b (diff)
some more cleanups - issed protecting 1 or 2 calls. gl still doesnt work tho
:) not on fglrx. SVN revision: 45388
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/evas_engine.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
index e03b9be4e4..9e60304a04 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -868,15 +868,7 @@ eng_image_alpha_get(void *data, void *image)
868// re = (Render_Engine *)data; 868// re = (Render_Engine *)data;
869 if (!image) return 1; 869 if (!image) return 1;
870 im = image; 870 im = image;
871 /* FIXME: can move to gl_common */ 871 return im->alpha;
872 switch (im->cs.space)
873 {
874 case EVAS_COLORSPACE_ARGB8888:
875 if (im->im->cache_entry.flags.alpha) return 1;
876 default:
877 break;
878 }
879 return 0;
880} 872}
881 873
882static int 874static int
@@ -899,13 +891,13 @@ eng_image_alpha_set(void *data, void *image, int has_alpha)
899 891
900 re = (Render_Engine *)data; 892 re = (Render_Engine *)data;
901 if (!image) return NULL; 893 if (!image) return NULL;
902 eng_window_use(re->win);
903 im = image; 894 im = image;
904 if (im->native.data) 895 if (im->native.data)
905 { 896 {
906 im->alpha = has_alpha; 897 im->alpha = has_alpha;
907 return image; 898 return image;
908 } 899 }
900 eng_window_use(re->win);
909 /* FIXME: can move to gl_common */ 901 /* FIXME: can move to gl_common */
910 if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return im; 902 if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return im;
911 if ((has_alpha) && (im->im->cache_entry.flags.alpha)) return image; 903 if ((has_alpha) && (im->im->cache_entry.flags.alpha)) return image;
@@ -953,6 +945,7 @@ eng_image_comment_get(void *data, void *image, char *key __UNUSED__)
953// re = (Render_Engine *)data; 945// re = (Render_Engine *)data;
954 if (!image) return NULL; 946 if (!image) return NULL;
955 im = image; 947 im = image;
948 if (!im->im) return NULL;
956 return im->im->info.comment; 949 return im->im->info.comment;
957} 950}
958 951
@@ -1418,8 +1411,8 @@ eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
1418 1411
1419 re = (Render_Engine *)data; 1412 re = (Render_Engine *)data;
1420 if (!image) return NULL; 1413 if (!image) return NULL;
1421 eng_window_use(re->win);
1422 if (im->native.data) return image; 1414 if (im->native.data) return image;
1415 eng_window_use(re->win);
1423 evas_gl_common_image_dirty(image, x, y, w, h); 1416 evas_gl_common_image_dirty(image, x, y, w, h);
1424 return image; 1417 return image;
1425} 1418}