forked from enlightenment/efl
some more cleanups - issed protecting 1 or 2 calls. gl still doesnt work tho
:) not on fglrx. SVN revision: 45388
This commit is contained in:
parent
c30b3cacb5
commit
33ba2279fc
|
@ -868,15 +868,7 @@ eng_image_alpha_get(void *data, void *image)
|
||||||
// re = (Render_Engine *)data;
|
// re = (Render_Engine *)data;
|
||||||
if (!image) return 1;
|
if (!image) return 1;
|
||||||
im = image;
|
im = image;
|
||||||
/* FIXME: can move to gl_common */
|
return im->alpha;
|
||||||
switch (im->cs.space)
|
|
||||||
{
|
|
||||||
case EVAS_COLORSPACE_ARGB8888:
|
|
||||||
if (im->im->cache_entry.flags.alpha) return 1;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -899,13 +891,13 @@ eng_image_alpha_set(void *data, void *image, int has_alpha)
|
||||||
|
|
||||||
re = (Render_Engine *)data;
|
re = (Render_Engine *)data;
|
||||||
if (!image) return NULL;
|
if (!image) return NULL;
|
||||||
eng_window_use(re->win);
|
|
||||||
im = image;
|
im = image;
|
||||||
if (im->native.data)
|
if (im->native.data)
|
||||||
{
|
{
|
||||||
im->alpha = has_alpha;
|
im->alpha = has_alpha;
|
||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
eng_window_use(re->win);
|
||||||
/* FIXME: can move to gl_common */
|
/* FIXME: can move to gl_common */
|
||||||
if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return im;
|
if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return im;
|
||||||
if ((has_alpha) && (im->im->cache_entry.flags.alpha)) return image;
|
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__)
|
||||||
// re = (Render_Engine *)data;
|
// re = (Render_Engine *)data;
|
||||||
if (!image) return NULL;
|
if (!image) return NULL;
|
||||||
im = image;
|
im = image;
|
||||||
|
if (!im->im) return NULL;
|
||||||
return im->im->info.comment;
|
return im->im->info.comment;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1418,8 +1411,8 @@ eng_image_dirty_region(void *data, void *image, int x, int y, int w, int h)
|
||||||
|
|
||||||
re = (Render_Engine *)data;
|
re = (Render_Engine *)data;
|
||||||
if (!image) return NULL;
|
if (!image) return NULL;
|
||||||
eng_window_use(re->win);
|
|
||||||
if (im->native.data) return image;
|
if (im->native.data) return image;
|
||||||
|
eng_window_use(re->win);
|
||||||
evas_gl_common_image_dirty(image, x, y, w, h);
|
evas_gl_common_image_dirty(image, x, y, w, h);
|
||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue