usergreen
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Pull Requests Activity

fix whitespace like trailing spaces and tabs

This commit is contained in:
Carsten Haitzler 2014-06-18 16:23:23 +09:00
parent e7550e7bbf
commit 121f234e4e
1 changed files with 147 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

272
src/modules/evas/engines/gl_common/evas_gl_texture.c
View File

@ -268,7 +268,7 @@ _tex_2d(Evas_Engine_GL_Context *gc, int intfmt, int w, int h, int fmt, int type)
static Evas_GL_Texture * static Evas_GL_Texture *
evas_gl_common_texture_alloc(Evas_Engine_GL_Context *gc, evas_gl_common_texture_alloc(Evas_Engine_GL_Context *gc,
Evas_Coord w, Evas_Coord h, Evas_Coord w, Evas_Coord h,
Eina_Bool alpha) Eina_Bool alpha)
{ {
Evas_GL_Texture *tex; Evas_GL_Texture *tex;
@ -1524,11 +1524,11 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
static Evas_GL_Texture * static Evas_GL_Texture *
_evas_gl_common_texture_y2uv_new(Evas_Engine_GL_Context *gc, _evas_gl_common_texture_y2uv_new(Evas_Engine_GL_Context *gc,
unsigned int yw, unsigned int yh, unsigned int yw, unsigned int yh,
Eina_Bool uv2w, Eina_Bool uv2h, Eina_Bool uv2w, Eina_Bool uv2h,
GLenum y_ifmt, GLenum y_fmt, GLenum y_ifmt, GLenum y_fmt,
GLenum uv_ifmt, GLenum uv_fmt, GLenum uv_ifmt, GLenum uv_fmt,
Eina_Bool dynamic) Eina_Bool dynamic)
{ {
Evas_GL_Texture_Pool *pt[2] = { NULL, NULL }; Evas_GL_Texture_Pool *pt[2] = { NULL, NULL };
Evas_GL_Texture_Pool *ptuv[2] = { NULL, NULL }; Evas_GL_Texture_Pool *ptuv[2] = { NULL, NULL };
@ -1543,8 +1543,8 @@ _evas_gl_common_texture_y2uv_new(Evas_Engine_GL_Context *gc,
ptuv[0] = _pool_tex_new(gc, uvw, uvh, uv_ifmt, uv_fmt); ptuv[0] = _pool_tex_new(gc, uvw, uvh, uv_ifmt, uv_fmt);
ptuv[1] = _pool_tex_new(gc, uvw, uvh, uv_ifmt, uv_fmt); ptuv[1] = _pool_tex_new(gc, uvw, uvh, uv_ifmt, uv_fmt);
if (ptuv[0] && ptuv[1]) if (ptuv[0] && ptuv[1])
{ {
pt[0] = _pool_tex_new(gc, pt[0] = _pool_tex_new(gc,
ptuv[0]->w * (uv2w ? 2 : 1), ptuv[0]->w * (uv2w ? 2 : 1),
ptuv[0]->h * (uv2h ? 2 : 1), ptuv[0]->h * (uv2h ? 2 : 1),
@ -1553,15 +1553,15 @@ _evas_gl_common_texture_y2uv_new(Evas_Engine_GL_Context *gc,
ptuv[1]->w * (uv2w ? 2 : 1), ptuv[1]->w * (uv2w ? 2 : 1),
ptuv[1]->h * (uv2h ? 2 : 1), ptuv[1]->h * (uv2h ? 2 : 1),
y_ifmt, y_fmt); y_ifmt, y_fmt);
} }
} }
else else
{ {
ptuv[0] = _pool_tex_dynamic_new(gc, uvw, uvh, uv_ifmt, uv_fmt); ptuv[0] = _pool_tex_dynamic_new(gc, uvw, uvh, uv_ifmt, uv_fmt);
ptuv[1] = _pool_tex_dynamic_new(gc, uvw, uvh, uv_ifmt, uv_fmt); ptuv[1] = _pool_tex_dynamic_new(gc, uvw, uvh, uv_ifmt, uv_fmt);
if (ptuv[0] && ptuv[1]) if (ptuv[0] && ptuv[1])
{ {
pt[0] = _pool_tex_dynamic_new(gc, pt[0] = _pool_tex_dynamic_new(gc,
ptuv[0]->w * (uv2w ? 2 : 1), ptuv[0]->w * (uv2w ? 2 : 1),
ptuv[0]->h * (uv2h ? 2 : 1), ptuv[0]->h * (uv2h ? 2 : 1),
@ -1570,7 +1570,7 @@ _evas_gl_common_texture_y2uv_new(Evas_Engine_GL_Context *gc,
ptuv[1]->w * (uv2w ? 2 : 1), ptuv[1]->w * (uv2w ? 2 : 1),
ptuv[1]->h * (uv2h ? 2 : 1), ptuv[1]->h * (uv2h ? 2 : 1),
y_ifmt, y_fmt); y_ifmt, y_fmt);
} }
} }
if (!pt[0] || !pt[1] || !ptuv[0] || !ptuv[1]) if (!pt[0] || !pt[1] || !ptuv[0] || !ptuv[1])
@ -1782,75 +1782,75 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
if (tex->dyn) if (tex->dyn)
{ {
char *texture_addr; char *texture_addr;
char *tmp; char *tmp;
texture_addr = secsym_eglMapImageSEC(tex->gc->egldisp, texture_addr = secsym_eglMapImageSEC(tex->gc->egldisp,
tex->pt->dyn.img, tex->pt->dyn.img,
EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC,
EGL_MAP_GL_TEXTURE_OPTION_WRITE_SEC); EGL_MAP_GL_TEXTURE_OPTION_WRITE_SEC);
/* Iterate each Y macroblock like we do in evas_convert_yuv.c */ /* Iterate each Y macroblock like we do in evas_convert_yuv.c */
for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++) for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
{ {
int step = 2; int step = 2;
int offset = 0; int offset = 0;
int x = 0; int x = 0;
int rmb_x = 0; int rmb_x = 0;
int ry[2]; int ry[2];
ry[0] = mb_y * 2 * 32 * tex->pt->dyn.stride; ry[0] = mb_y * 2 * 32 * tex->pt->dyn.stride;
ry[1] = ry[0] + 32 * tex->pt->dyn.stride; ry[1] = ry[0] + 32 * tex->pt->dyn.stride;
for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32) for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32)
{ {
unsigned int i; unsigned int i;
tmp = texture_addr + x + ry[offset]; tmp = texture_addr + x + ry[offset];
for (i = 0; i < 32 * 64; i += 64, tmp += tex->pt->dyn.stride) for (i = 0; i < 32 * 64; i += 64, tmp += tex->pt->dyn.stride)
memcpy(tmp, rows[mb_y] + rmb_x + i, 64); memcpy(tmp, rows[mb_y] + rmb_x + i, 64);
step++; step++;
if ((step & 0x3) == 0) if ((step & 0x3) == 0)
{ {
offset = 1 - offset; offset = 1 - offset;
x -= 64; x -= 64;
} }
else else
{ {
x += 64; x += 64;
} }
} }
} }
if (mb_h & 0x1) if (mb_h & 0x1)
{ {
int rmb_x = 0; int rmb_x = 0;
int x = 0; int x = 0;
int ry; int ry;
ry = mb_y * 2 * 32 * tex->pt->dyn.stride; ry = mb_y * 2 * 32 * tex->pt->dyn.stride;
for (mb_x = 0; mb_x < mb_w; mb_x++, x += 64, rmb_x += 64 * 32) for (mb_x = 0; mb_x < mb_w; mb_x++, x += 64, rmb_x += 64 * 32)
{ {
unsigned int i; unsigned int i;
tmp = texture_addr + x + ry; tmp = texture_addr + x + ry;
for (i = 0; i < 32 * 64; i += 64, tmp += tex->pt->dyn.stride) for (i = 0; i < 32 * 64; i += 64, tmp += tex->pt->dyn.stride)
memcpy(tmp, rows[mb_y] + rmb_x + i, 64); memcpy(tmp, rows[mb_y] + rmb_x + i, 64);
} }
} }
secsym_eglUnmapImageSEC(tex->gc->egldisp, tex->pt->dyn.img, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC); secsym_eglUnmapImageSEC(tex->gc->egldisp, tex->pt->dyn.img, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC);
texture_addr = secsym_eglMapImageSEC(tex->gc->egldisp, texture_addr = secsym_eglMapImageSEC(tex->gc->egldisp,
tex->ptuv->dyn.img, tex->ptuv->dyn.img,
EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC,
EGL_MAP_GL_TEXTURE_OPTION_WRITE_SEC); EGL_MAP_GL_TEXTURE_OPTION_WRITE_SEC);
/* Iterate each UV macroblock like we do in evas_convert_yuv.c */ /* Iterate each UV macroblock like we do in evas_convert_yuv.c */
base_h = (mb_h >> 1) + (mb_h & 0x1); base_h = (mb_h >> 1) + (mb_h & 0x1);
/* h is always a multiple of 32 */ /* h is always a multiple of 32 */
mb_h = h / 2; mb_h = h / 2;
@ -1859,61 +1859,61 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
mb_w = w / 2; mb_w = w / 2;
mb_w = (mb_w / 64 + (mb_w % 64 ? 1 : 0)); mb_w = (mb_w / 64 + (mb_w % 64 ? 1 : 0));
for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++) for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
{ {
int step = 2; int step = 2;
int offset = 0; int offset = 0;
int x = 0; int x = 0;
int rmb_x = 0; int rmb_x = 0;
int ry[2]; int ry[2];
ry[0] = mb_y * 2 * 32 * tex->ptuv->dyn.stride; ry[0] = mb_y * 2 * 32 * tex->ptuv->dyn.stride;
ry[1] = ry[0] + 32 * tex->ptuv->dyn.stride; ry[1] = ry[0] + 32 * tex->ptuv->dyn.stride;
for (mb_x = 0; mb_x < mb_w * 4; mb_x++, rmb_x += 64 * 32) for (mb_x = 0; mb_x < mb_w * 4; mb_x++, rmb_x += 64 * 32)
{ {
unsigned int i = 0; unsigned int i = 0;
tmp = texture_addr + x + ry[offset]; tmp = texture_addr + x + ry[offset];
for (i = 0; i < 32 * 64; i += 64, tmp += tex->ptuv->dyn.stride) for (i = 0; i < 32 * 64; i += 64, tmp += tex->ptuv->dyn.stride)
memcpy(tmp, rows[mb_y + base_h] + rmb_x + i, 64); memcpy(tmp, rows[mb_y + base_h] + rmb_x + i, 64);
step++; step++;
if ((step & 0x3) == 0) if ((step & 0x3) == 0)
{ {
offset = 1 - offset; offset = 1 - offset;
x -= 64; x -= 64;
} }
else else
{ {
x += 64; x += 64;
} }
} }
} }
if (mb_h & 0x1) if (mb_h & 0x1)
{ {
int rmb_x = 0; int rmb_x = 0;
int x = 0; int x = 0;
int ry; int ry;
ry = mb_y * 2 * 32 * tex->ptuv->dyn.stride; ry = mb_y * 2 * 32 * tex->ptuv->dyn.stride;
for (mb_x = 0; mb_x < mb_w * 2; mb_x++, x += 64, rmb_x += 64 * 32) for (mb_x = 0; mb_x < mb_w * 2; mb_x++, x += 64, rmb_x += 64 * 32)
{ {
unsigned int i; unsigned int i;
tmp = texture_addr + x + ry; tmp = texture_addr + x + ry;
/* It has horizontaly half the pixels, but they are double the size*/ /* It has horizontaly half the pixels, but they are double the size*/
for (i = 0; i < 32 * 64; i += 64, tmp += tex->ptuv->dyn.stride) for (i = 0; i < 32 * 64; i += 64, tmp += tex->ptuv->dyn.stride)
memcpy(tmp, rows[mb_y + base_h] + rmb_x + i, 64); memcpy(tmp, rows[mb_y + base_h] + rmb_x + i, 64);
} }
} }
secsym_eglUnmapImageSEC(tex->gc->egldisp, tex->ptuv->dyn.img, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC); secsym_eglUnmapImageSEC(tex->gc->egldisp, tex->ptuv->dyn.img, EGL_MAP_GL_TEXTURE_DEVICE_CPU_SEC);
return; return;
} }
#endif #endif
@ -1931,41 +1931,41 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++) for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
{ {
int step = 2; int step = 2;
int offset = 0; int offset = 0;
int x = 0; int x = 0;
int rmb_x = 0; int rmb_x = 0;
int ry[2]; int ry[2];
ry[0] = mb_y * 2 * 32; ry[0] = mb_y * 2 * 32;
ry[1] = ry[0] + 32; ry[1] = ry[0] + 32;
for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32) for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32)
{ {
_tex_sub_2d(tex->gc, x, ry[offset], 64, 32, tex->pt->format, tex->pt->dataformat, rows[mb_y] + rmb_x); _tex_sub_2d(tex->gc, x, ry[offset], 64, 32, tex->pt->format, tex->pt->dataformat, rows[mb_y] + rmb_x);
step++; step++;
if ((step & 0x3) == 0) if ((step & 0x3) == 0)
{ {
offset = 1 - offset; offset = 1 - offset;
x -= 64; x -= 64;
} }
else else
{ {
x += 64; x += 64;
} }
} }
} }
if (mb_h & 0x1) if (mb_h & 0x1)
{ {
int rmb_x = 0; int rmb_x = 0;
int x = 0; int x = 0;
int ry; int ry;
ry = mb_y * 2 * 32; ry = mb_y * 2 * 32;
for (mb_x = 0; mb_x < mb_w; mb_x++, x += 64, rmb_x += 64 * 32) for (mb_x = 0; mb_x < mb_w; mb_x++, x += 64, rmb_x += 64 * 32)
_tex_sub_2d(tex->gc, x, ry, 64, 32, tex->pt->format, tex->pt->dataformat, rows[mb_y] + rmb_x); _tex_sub_2d(tex->gc, x, ry, 64, 32, tex->pt->format, tex->pt->dataformat, rows[mb_y] + rmb_x);
} }
glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture); glBindTexture(GL_TEXTURE_2D, tex->ptuv->texture);
@ -1987,16 +1987,16 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++) for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
{ {
int step = 2; int step = 2;
int offset = 0; int offset = 0;
int x = 0; int x = 0;
int rmb_x = 0; int rmb_x = 0;
int ry[2]; int ry[2];
ry[0] = mb_y * 2 * 32; ry[0] = mb_y * 2 * 32;
ry[1] = ry[0] + 32; ry[1] = ry[0] + 32;
for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32) for (mb_x = 0; mb_x < mb_w * 2; mb_x++, rmb_x += 64 * 32)
{ {
_tex_sub_2d(tex->gc, x, ry[offset], 32, 32, _tex_sub_2d(tex->gc, x, ry[offset], 32, 32,
tex->ptuv->format, tex->ptuv->dataformat, tex->ptuv->format, tex->ptuv->dataformat,
rows[mb_y + base_h] + rmb_x); rows[mb_y + base_h] + rmb_x);
@ -2010,18 +2010,18 @@ evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture *tex, DATA8 **rows, unsi
{ {
x += 32; x += 32;
} }
} }
} }
if (mb_h & 0x1) if (mb_h & 0x1)
{ {
int rmb_x = 0; int rmb_x = 0;
int x = 0; int x = 0;
int ry; int ry;
ry = mb_y * 2 * 32; ry = mb_y * 2 * 32;
for (mb_x = 0; mb_x < mb_w; mb_x++, x += 32, rmb_x += 64 * 32) for (mb_x = 0; mb_x < mb_w; mb_x++, x += 32, rmb_x += 64 * 32)
_tex_sub_2d(tex->gc, x, ry, 64, 32, tex->ptuv->format, tex->ptuv->dataformat, rows[mb_y + base_h] + rmb_x); _tex_sub_2d(tex->gc, x, ry, 64, 32, tex->ptuv->format, tex->ptuv->dataformat, rows[mb_y + base_h] + rmb_x);
} }
} }