forked from enlightenment/efl
parent
19ef9ecc95
commit
18d1e68924
|
@ -6,7 +6,6 @@
|
|||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
|
|
|
@ -44,5 +44,3 @@ struct _Evas_Engine_Info_GL_X11
|
|||
unsigned char indirect : 1; // use indirect rendering
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -1703,9 +1703,9 @@ eng_image_size_set(void *data, void *image, int w, int h)
|
|||
return image;
|
||||
if (im_old)
|
||||
{
|
||||
im = evas_gl_common_image_new(re->win->gl_context, w, h,
|
||||
eng_image_alpha_get(data, image),
|
||||
eng_image_colorspace_get(data, image));
|
||||
im = evas_gl_common_image_new(re->win->gl_context, w, h,
|
||||
eng_image_alpha_get(data, image),
|
||||
eng_image_colorspace_get(data, image));
|
||||
/*
|
||||
evas_common_load_image_data_from_file(im_old->im);
|
||||
if (im_old->im->image->data)
|
||||
|
@ -1773,22 +1773,22 @@ eng_image_data_get(void *data, void *image, int to_write, DATA32 **image_data, i
|
|||
{
|
||||
Evas_GL_Image *im_new;
|
||||
|
||||
im_new = evas_gl_common_image_new_from_copied_data
|
||||
im_new = evas_gl_common_image_new_from_copied_data
|
||||
(im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
|
||||
im->im->image.data,
|
||||
eng_image_alpha_get(data, image),
|
||||
eng_image_colorspace_get(data, image));
|
||||
if (!im_new)
|
||||
{
|
||||
*image_data = NULL;
|
||||
if (!im_new)
|
||||
{
|
||||
*image_data = NULL;
|
||||
if (err) *err = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
|
||||
return im;
|
||||
}
|
||||
evas_gl_common_image_free(im);
|
||||
im = im_new;
|
||||
return im;
|
||||
}
|
||||
evas_gl_common_image_free(im);
|
||||
im = im_new;
|
||||
}
|
||||
else
|
||||
evas_gl_common_image_dirty(im, 0, 0, 0, 0);
|
||||
else
|
||||
evas_gl_common_image_dirty(im, 0, 0, 0, 0);
|
||||
}
|
||||
*image_data = im->im->image.data;
|
||||
break;
|
||||
|
@ -1830,9 +1830,9 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
|
|||
im2 = eng_image_new_from_data(data, w, h, image_data,
|
||||
eng_image_alpha_get(data, image),
|
||||
eng_image_colorspace_get(data, image));
|
||||
if (!im2) return im;
|
||||
evas_gl_common_image_free(im);
|
||||
im = im2;
|
||||
if (!im2) return im;
|
||||
evas_gl_common_image_free(im);
|
||||
im = im2;
|
||||
evas_gl_common_image_dirty(im, 0, 0, 0, 0);
|
||||
return im;
|
||||
}
|
||||
|
@ -1849,9 +1849,9 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
|
|||
im2 = eng_image_new_from_data(data, w, h, image_data,
|
||||
eng_image_alpha_get(data, image),
|
||||
eng_image_colorspace_get(data, image));
|
||||
if (!im2) return im;
|
||||
evas_gl_common_image_free(im);
|
||||
im = im2;
|
||||
if (!im2) return im;
|
||||
evas_gl_common_image_free(im);
|
||||
im = im2;
|
||||
}
|
||||
break;
|
||||
case EVAS_COLORSPACE_YCBCR422P601_PL:
|
||||
|
@ -2073,10 +2073,10 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
|
|||
im->cache_entry.w = re->win->w;
|
||||
im->cache_entry.h = re->win->h;
|
||||
evas_common_draw_context_font_ext_set(context,
|
||||
re->win->gl_context,
|
||||
evas_gl_font_texture_new,
|
||||
evas_gl_font_texture_free,
|
||||
evas_gl_font_texture_draw);
|
||||
re->win->gl_context,
|
||||
evas_gl_font_texture_new,
|
||||
evas_gl_font_texture_free,
|
||||
evas_gl_font_texture_draw);
|
||||
evas_common_font_draw(im, context, (RGBA_Font *) font, x, y,
|
||||
intl_props);
|
||||
evas_common_draw_context_font_ext_set(context,
|
||||
|
|
Loading…
Reference in New Issue