summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/gl_common
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-06-20 09:54:26 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-06-23 10:31:36 +0200
commit47b71d898ea522e60ca83567d7b68fbc0b9aaf82 (patch)
tree462c07e3b767c96d23edfc91465d00b5b82a46c8 /src/modules/evas/engines/gl_common
parentc7da405ae74dd1229a679f535e703c951bdaaac3 (diff)
Get rid of trailing whitespaces (13 / 14)
Remove trailing whitespaces Differential Revision: https://phab.enlightenment.org/D12012
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c8
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_core_private.h2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_font.c2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_image.c10
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c6
6 files changed, 16 insertions, 16 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 0012065dc1..5b40037560 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -319,7 +319,7 @@ evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
319 FINDSYM(glsym_glStartTiling, "glActivateTileQCOM", NULL, glsym_func_void); 319 FINDSYM(glsym_glStartTiling, "glActivateTileQCOM", NULL, glsym_func_void);
320 FINDSYM(glsym_glEndTiling, "glEndTilingQCOM", "GL_QCOM_tiled_rendering", glsym_func_void); 320 FINDSYM(glsym_glEndTiling, "glEndTilingQCOM", "GL_QCOM_tiled_rendering", glsym_func_void);
321 FINDSYM(glsym_glEndTiling, "glEndTiling", NULL, glsym_func_void); 321 FINDSYM(glsym_glEndTiling, "glEndTiling", NULL, glsym_func_void);
322 322
323 if (!getenv("EVAS_GL_MAPBUFFER_DISABLE")) 323 if (!getenv("EVAS_GL_MAPBUFFER_DISABLE"))
324 { 324 {
325 // Not sure there's an EXT variant. (probably no KHR variant) 325 // Not sure there's an EXT variant. (probably no KHR variant)
@@ -2289,7 +2289,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2289 (tex->im->orient == EVAS_IMAGE_ORIENT_90)) 2289 (tex->im->orient == EVAS_IMAGE_ORIENT_90))
2290 { 2290 {
2291 double tmp; 2291 double tmp;
2292 2292
2293 SWAP(&sw, &sh, tmp); 2293 SWAP(&sw, &sh, tmp);
2294 SWAP(&sx, &sy, tmp); 2294 SWAP(&sx, &sy, tmp);
2295 2295
@@ -2333,7 +2333,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2333 2333
2334 SWAP(&sw, &sh, tmp); 2334 SWAP(&sw, &sh, tmp);
2335 SWAP(&sx, &sy, tmp); 2335 SWAP(&sx, &sy, tmp);
2336 2336
2337 sx = tex->im->w - sw - sx; 2337 sx = tex->im->w - sw - sx;
2338 sy = tex->im->h - sh - sy; 2338 sy = tex->im->h - sh - sy;
2339 } 2339 }
@@ -2424,7 +2424,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2424 } 2424 }
2425 2425
2426 PUSH_MASK(pn, mtex, mx, my, mw, mh, masksam); 2426 PUSH_MASK(pn, mtex, mx, my, mw, mh, masksam);
2427 2427
2428 if (!nomul) 2428 if (!nomul)
2429 PUSH_6_COLORS(pn, r, g, b, a); 2429 PUSH_6_COLORS(pn, r, g, b, a);
2430} 2430}
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core_private.h b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
index e6afff639c..a131f9679a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
@@ -342,7 +342,7 @@ struct _EVGL_Engine
342 Eina_List *surfaces; 342 Eina_List *surfaces;
343 Eina_List *contexts; 343 Eina_List *contexts;
344 344
345 //void *engine_data; 345 //void *engine_data;
346 Eina_Hash *safe_extensions; 346 Eina_Hash *safe_extensions;
347}; 347};
348 348
diff --git a/src/modules/evas/engines/gl_common/evas_gl_font.c b/src/modules/evas/engines/gl_common/evas_gl_font.c
index 52e4d4e4a9..53260d971d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_font.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_font.c
@@ -20,7 +20,7 @@ evas_gl_font_texture_new(void *context, RGBA_Font_Glyph *fg)
20 20
21 // expand to 32bit (4 byte) aligned rows for texture upload 21 // expand to 32bit (4 byte) aligned rows for texture upload
22 nw = ((w + 3) / 4) * 4; 22 nw = ((w + 3) / 4) * 4;
23 // if image already (4 byte) aligned rows then assign old image data to new data(ndata) to 23 // if image already (4 byte) aligned rows then assign old image data to new data(ndata) to
24 if(nw == w){ 24 if(nw == w){
25 ndata = data; 25 ndata = data;
26 } else { 26 } else {
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 41806c1ea6..2d9383305a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -332,7 +332,7 @@ evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, u
332 if (((int)w > gc->shared->info.max_texture_size) || 332 if (((int)w > gc->shared->info.max_texture_size) ||
333 ((int)h > gc->shared->info.max_texture_size)) 333 ((int)h > gc->shared->info.max_texture_size))
334 return NULL; 334 return NULL;
335 335
336 if (data) 336 if (data)
337 { 337 {
338 EINA_LIST_FOREACH(gc->shared->images, l, im) 338 EINA_LIST_FOREACH(gc->shared->images, l, im)
@@ -399,7 +399,7 @@ evas_gl_common_image_new_from_copied_data(Evas_Engine_GL_Context *gc, unsigned i
399 if (((int)w > gc->shared->info.max_texture_size) || 399 if (((int)w > gc->shared->info.max_texture_size) ||
400 ((int)h > gc->shared->info.max_texture_size)) 400 ((int)h > gc->shared->info.max_texture_size))
401 return NULL; 401 return NULL;
402 402
403 im = calloc(1, sizeof(Evas_GL_Image)); 403 im = calloc(1, sizeof(Evas_GL_Image));
404 if (!im) return NULL; 404 if (!im) return NULL;
405 im->references = 1; 405 im->references = 1;
@@ -453,7 +453,7 @@ evas_gl_common_image_new(Evas_Engine_GL_Context *gc, unsigned int w, unsigned in
453 if (((int)w > gc->shared->info.max_texture_size) || 453 if (((int)w > gc->shared->info.max_texture_size) ||
454 ((int)h > gc->shared->info.max_texture_size)) 454 ((int)h > gc->shared->info.max_texture_size))
455 return NULL; 455 return NULL;
456 456
457 im = calloc(1, sizeof(Evas_GL_Image)); 457 im = calloc(1, sizeof(Evas_GL_Image));
458 if (!im) return NULL; 458 if (!im) return NULL;
459 im->references = 1; 459 im->references = 1;
@@ -735,7 +735,7 @@ evas_gl_common_image_surface_new(Evas_Engine_GL_Context *gc, unsigned int w, uns
735 if (((int)w > gc->shared->info.max_texture_size) || 735 if (((int)w > gc->shared->info.max_texture_size) ||
736 ((int)h > gc->shared->info.max_texture_size)) 736 ((int)h > gc->shared->info.max_texture_size))
737 return NULL; 737 return NULL;
738 738
739 im = calloc(1, sizeof(Evas_GL_Image)); 739 im = calloc(1, sizeof(Evas_GL_Image));
740 if (!im) return NULL; 740 if (!im) return NULL;
741 im->references = 1; 741 im->references = 1;
@@ -1352,7 +1352,7 @@ evas_gl_common_image_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im,
1352 } 1352 }
1353 1353
1354 if ((sw == dw) && (sh == dh)) smooth = 0; 1354 if ((sw == dw) && (sh == dh)) smooth = 0;
1355 1355
1356 im->tex->im = im; 1356 im->tex->im = im;
1357 if ((!gc->dc->cutout.rects) || 1357 if ((!gc->dc->cutout.rects) ||
1358 ((gc->shared->info.tune.cutout.max > 0) && 1358 ((gc->shared->info.tune.cutout.max > 0) &&
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 666f944d82..df5a4be924 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -98,7 +98,7 @@ _evas_gl_preload_main_loop_wakeup(void)
98 { 98 {
99 async->tex->was_preloaded = EINA_TRUE; 99 async->tex->was_preloaded = EINA_TRUE;
100 100
101 async->tex->ptt->allocations = 101 async->tex->ptt->allocations =
102 eina_list_remove(async->tex->ptt->allocations, 102 eina_list_remove(async->tex->ptt->allocations,
103 async->tex->aptt); 103 async->tex->aptt);
104 eina_rectangle_pool_release(async->tex->aptt); 104 eina_rectangle_pool_release(async->tex->aptt);
@@ -135,7 +135,7 @@ _evas_gl_preload_lock(void)
135 eina_condition_signal(&async_loader_cond); 135 eina_condition_signal(&async_loader_cond);
136 136
137 eina_condition_wait(&async_loader_cond); 137 eina_condition_wait(&async_loader_cond);
138 if (async_loader_exit) 138 if (async_loader_exit)
139 { 139 {
140 eina_lock_release(&async_loader_lock); 140 eina_lock_release(&async_loader_lock);
141 return EINA_FALSE; 141 return EINA_FALSE;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 2c1d1e28cf..1aa9d3ccb0 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -337,7 +337,7 @@ _tex_2d(Evas_Engine_GL_Context *gc, int intfmt, int w, int h, int fmt, int type)
337#ifdef GL_TEXTURE_INTERNAL_FORMAT 337#ifdef GL_TEXTURE_INTERNAL_FORMAT
338# ifdef GL_GLES 338# ifdef GL_GLES
339# else 339# else
340// this is not in opengles!!! hrrrm 340// this is not in opengles!!! hrrrm
341// if (glGetTexLevelParameteriv) // in case of weak symbols? 341// if (glGetTexLevelParameteriv) // in case of weak symbols?
342 { 342 {
343 int intfmtret = -1; 343 int intfmtret = -1;
@@ -1605,7 +1605,7 @@ evas_gl_common_texture_free(Evas_GL_Texture *tex, Eina_Bool force)
1605 tex->ptv2 = NULL; 1605 tex->ptv2 = NULL;
1606 tex->ptuv = NULL; 1606 tex->ptuv = NULL;
1607 1607
1608 if (tex->im) 1608 if (tex->im)
1609 { 1609 {
1610 tex->im->tex = NULL; 1610 tex->im->tex = NULL;
1611 if (tex->im->im) tex->im->im->cache_entry.flags.textured = 0; 1611 if (tex->im->im) tex->im->im->cache_entry.flags.textured = 0;
@@ -1974,7 +1974,7 @@ evas_gl_common_texture_yuv_update(Evas_GL_Texture *tex, DATA8 **rows, unsigned i
1974 else if (rows[0] && rows[h]) 1974 else if (rows[0] && rows[h])
1975 { 1975 {
1976 unsigned int y; 1976 unsigned int y;
1977 1977
1978 glPixelStorei(GL_UNPACK_ALIGNMENT, 1); 1978 glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
1979 glBindTexture(GL_TEXTURE_2D, tex->pt->texture); 1979 glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
1980 if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat)) 1980 if (!_tex_2d(tex->gc, tex->pt->intformat, w, h, tex->pt->format, tex->pt->dataformat))