parent
f43571de3a
commit
6b3e820f35
|
@ -647,8 +647,6 @@ evas_gl_texture_pool_empty(Evas_GL_Texture_Pool *pt)
|
||||||
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
|
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
|
||||||
if (pt->dyn.img)
|
if (pt->dyn.img)
|
||||||
{
|
{
|
||||||
void *egldisplay = pt->gc->egldisp;
|
|
||||||
|
|
||||||
secsym_eglDestroyImage(pt->gc->egldisp, pt->dyn.img);
|
secsym_eglDestroyImage(pt->gc->egldisp, pt->dyn.img);
|
||||||
pt->dyn.img = NULL;
|
pt->dyn.img = NULL;
|
||||||
pt->dyn.data = NULL;
|
pt->dyn.data = NULL;
|
||||||
|
@ -1052,13 +1050,13 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
_tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
|
_tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
|
||||||
#else
|
#else
|
||||||
int y;
|
unsigned int y;
|
||||||
|
|
||||||
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
|
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
if ((rows[1] - rows[0]) == w)
|
if ((rows[1] - rows[0]) == (int)w)
|
||||||
_tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
|
_tex_sub_2d(0, 0, w, h, tex->pt->format, tex->pt->dataformat, rows[0]);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1068,7 +1066,7 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
|
glBindTexture(GL_TEXTURE_2D, tex->ptu->texture);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
if ((rows[h + 1] - rows[h]) == (w / 2))
|
if ((rows[h + 1] - rows[h]) == (int)(w / 2))
|
||||||
_tex_sub_2d(0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
|
_tex_sub_2d(0, 0, w / 2, h / 2, tex->ptu->format, tex->ptu->dataformat, rows[h]);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1078,7 +1076,7 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
|
||||||
|
|
||||||
glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
|
glBindTexture(GL_TEXTURE_2D, tex->ptv->texture);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
if ((rows[h + (h / 2) + 1] - rows[h + (h / 2)]) == (w / 2))
|
if ((rows[h + (h / 2) + 1] - rows[h + (h / 2)]) == (int)(w / 2))
|
||||||
_tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
|
_tex_sub_2d(0, 0, w / 2, h / 2, tex->ptv->format, tex->ptv->dataformat, rows[h + (h / 2)]);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1122,6 +1122,8 @@ _native_bind_cb(void *data, void *image)
|
||||||
glBindTexture(GL_TEXTURE_2D, n->ns.data.opengl.texture_id);
|
glBindTexture(GL_TEXTURE_2D, n->ns.data.opengl.texture_id);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
|
data = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1154,6 +1156,8 @@ _native_unbind_cb(void *data, void *image)
|
||||||
glBindTexture(GL_TEXTURE_2D, 0);
|
glBindTexture(GL_TEXTURE_2D, 0);
|
||||||
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
GLERR(__FUNCTION__, __FILE__, __LINE__, "");
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
|
data = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -218,9 +218,9 @@ eng_window_new(Display *disp,
|
||||||
vendor = glGetString(GL_VENDOR);
|
vendor = glGetString(GL_VENDOR);
|
||||||
renderer = glGetString(GL_RENDERER);
|
renderer = glGetString(GL_RENDERER);
|
||||||
version = glGetString(GL_VERSION);
|
version = glGetString(GL_VERSION);
|
||||||
if (!vendor) vendor = "-UNKNOWN-";
|
if (!vendor) vendor = (unsigned char *)"-UNKNOWN-";
|
||||||
if (!renderer) renderer = "-UNKNOWN-";
|
if (!renderer) renderer = (unsigned char *)"-UNKNOWN-";
|
||||||
if (!version) version = "-UNKNOWN-";
|
if (!version) version = (unsigned char *)"-UNKNOWN-";
|
||||||
if (getenv("EVAS_GL_INFO"))
|
if (getenv("EVAS_GL_INFO"))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "vendor: %s\n", vendor);
|
fprintf(stderr, "vendor: %s\n", vendor);
|
||||||
|
@ -513,6 +513,7 @@ eng_window_new(Display *disp,
|
||||||
evas_gl_common_context_resize(gw->gl_context, w, h, rot);
|
evas_gl_common_context_resize(gw->gl_context, w, h, rot);
|
||||||
gw->surf = 1;
|
gw->surf = 1;
|
||||||
return gw;
|
return gw;
|
||||||
|
indirect = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue