From: Enlightenment S. <no-...@en...> - 2009-01-27 23:57:28
|
Log: extra fragment shader prog to 0 call. remove. useless. Author: raster Date: 2009-01-27 15:57:21 -0800 (Tue, 27 Jan 2009) New Revision: 38820 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-01-27 23:27:42 UTC (rev 38819) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-01-27 23:57:21 UTC (rev 38820) @@ -367,7 +367,6 @@ if (!gc->change.texture) return; if (gc->font_texture > 0) { - glUseProgramObjectARB(0); if (gc->texture_program) { glUseProgramObjectARB(0); |
From: Enlightenment S. <no-...@en...> - 2009-10-09 15:17:49
|
Log: oops missed file. Author: raster Date: 2009-10-09 08:17:27 -0700 (Fri, 09 Oct 2009) New Revision: 42983 Added: trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c |
From: Enlightenment S. <no-...@en...> - 2009-10-10 14:55:23
|
Log: and delete u and v textures too Author: raster Date: 2009-10-10 07:55:10 -0700 (Sat, 10 Oct 2009) New Revision: 43002 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-10 14:48:34 UTC (rev 43001) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-10 14:55:10 UTC (rev 43002) @@ -273,6 +273,24 @@ } } +static void +pt_unref(Evas_GL_Texture_Pool *pt) +{ + pt->references--; + if (pt->references > 0) return; + if (pt->whole) + { + pt->gc->tex.whole = eina_list_remove(pt->gc->tex.whole, pt); + } + else + { + pt->gc->tex.atlas [pt->slot][pt->fslot] = + eina_list_remove(pt->gc->tex.atlas[pt->slot][pt->fslot], pt); + } + glDeleteTextures(1, &(pt->texture)); + free(pt); +} + void evas_gl_common_texture_free(Evas_GL_Texture *tex) { @@ -280,26 +298,9 @@ tex->references--; if (tex->references > 0) return; tex->pt->allocations = eina_list_remove(tex->pt->allocations, tex); - tex->pt->references--; - if (tex->pt->references <= 0) - { - if (tex->pt->whole) - { - tex->gc->tex.whole = - eina_list_remove(tex->gc->tex.whole, tex->pt); - } - else - { - tex->gc->tex.atlas - [tex->pt->slot][tex->pt->fslot] = - eina_list_remove - (tex->gc->tex.atlas - [tex->pt->slot][tex->pt->fslot], - tex->pt); - } - glDeleteTextures(1, &(tex->pt->texture)); - free(tex->pt); - } + pt_unref(tex->pt); + if (tex->ptu) pt_unref(tex->ptu); + if (tex->ptv) pt_unref(tex->ptv); free(tex); } |
From: Enlightenment S. <no-...@en...> - 2009-10-12 03:35:45
|
Log: remove _dends. old code. Author: raster Date: 2009-10-11 20:35:32 -0700 (Sun, 11 Oct 2009) New Revision: 43031 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c 2009-10-12 03:31:24 UTC (rev 43030) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c 2009-10-12 03:35:32 UTC (rev 43031) @@ -15,7 +15,7 @@ { rect_frag_glsl, #if defined (GLES_VARIETY_S3C6410) - rect_frag_bin, sizeof(rect_frag_bin_end) + rect_frag_bin, sizeof(rect_frag_bin) #else NULL, 0 #endif @@ -55,7 +55,7 @@ { img_frag_glsl, #if defined (GLES_VARIETY_S3C6410) - img_frag_bin, sizeof(img_frag_bin_end) + img_frag_bin, sizeof(img_frag_bin) #else NULL, 0 #endif @@ -95,7 +95,7 @@ { font_frag_glsl, #if defined (GLES_VARIETY_S3C6410) - font_frag_bin, sizeof(font_frag_bin_end) + font_frag_bin, sizeof(font_frag_bin) #else NULL, 0 #endif @@ -135,7 +135,7 @@ { yuv_frag_glsl, #if defined (GLES_VARIETY_S3C6410) - yuv_frag_bin, sizeof(yuv_frag_bin_end) + yuv_frag_bin, sizeof(yuv_frag_bin) #else NULL, 0 #endif |
From: Enlightenment S. <no-...@en...> - 2009-10-12 03:43:14
|
Log: and fix more bits not tested yet Author: raster Date: 2009-10-11 20:43:00 -0700 (Sun, 11 Oct 2009) New Revision: 43032 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c 2009-10-12 03:35:32 UTC (rev 43031) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c 2009-10-12 03:43:00 UTC (rev 43032) @@ -22,7 +22,7 @@ }; #if defined (GLES_VARIETY_S3C6410) -const unsigned int rect_frag_bin[] = +const unsigned int rect_vert_bin[] = { # include "shader/rect_vert_bin_s3c6410.h" }; @@ -62,7 +62,7 @@ }; #if defined (GLES_VARIETY_S3C6410) -const unsigned int img_frag_bin[] = +const unsigned int img_vert_bin[] = { # include "shader/img_vert_bin_s3c6410.h" }; @@ -102,7 +102,7 @@ }; #if defined (GLES_VARIETY_S3C6410) -const unsigned int font_frag_bin[] = +const unsigned int font_vert_bin[] = { # include "shader/font_vert_bin_s3c6410.h" }; @@ -142,7 +142,7 @@ }; #if defined (GLES_VARIETY_S3C6410) -const unsigned int yuv_frag_bin[] = +const unsigned int yuv_vert_bin[] = { # include "shader/yuv_vert_bin_s3c6410.h" }; |
From: Enlightenment S. <no-...@en...> - 2009-10-12 18:02:47
|
Log: dont eed these params here Author: raster Date: 2009-10-12 11:02:33 -0700 (Mon, 12 Oct 2009) New Revision: 43038 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-12 15:22:38 UTC (rev 43037) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-12 18:02:33 UTC (rev 43038) @@ -67,8 +67,6 @@ pt->references = 0; glGenTextures(1, &(pt->texture)); glBindTexture(GL_TEXTURE_2D, pt->texture); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0, format, GL_UNSIGNED_BYTE/* fixme - pass this in */, NULL); glBindTexture(GL_TEXTURE_2D, gc->shader.cur_tex); |
From: Enlightenment S. <no-...@en...> - 2009-10-13 00:37:31
|
Log: set tex min/mag filter always Author: raster Date: 2009-10-12 17:37:16 -0700 (Mon, 12 Oct 2009) New Revision: 43044 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-12 22:00:14 UTC (rev 43043) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-13 00:37:16 UTC (rev 43044) @@ -514,6 +514,8 @@ #endif glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); } else { @@ -522,6 +524,10 @@ #endif glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); +// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); +// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); } } Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-12 22:00:14 UTC (rev 43043) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-13 00:37:16 UTC (rev 43044) @@ -67,6 +67,10 @@ pt->references = 0; glGenTextures(1, &(pt->texture)); glBindTexture(GL_TEXTURE_2D, pt->texture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0, format, GL_UNSIGNED_BYTE/* fixme - pass this in */, NULL); glBindTexture(GL_TEXTURE_2D, gc->shader.cur_tex); |
From: Enlightenment S. <no-...@en...> - 2009-10-13 01:44:58
|
Log: free up stuff on context free. still need to do programs Author: raster Date: 2009-10-12 18:44:46 -0700 (Mon, 12 Oct 2009) New Revision: 43046 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-13 01:30:04 UTC (rev 43045) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-13 01:44:46 UTC (rev 43046) @@ -143,7 +143,10 @@ gc->references--; if (gc->references > 0) return; -/* + while (gc->images) + { + evas_gl_common_image_free(gc->images->data); + } while (gc->tex.whole) { evas_gl_common_texture_free(gc->tex.whole->data); @@ -156,11 +159,6 @@ evas_gl_common_texture_free(gc->tex.atlas[i][j]); } } - while (gc->images) - { - evas_gl_common_image_free(gc->images->data); - } - */ // FIXME: free shader.rect.prog etc. etc. free(gc->array.vertex); |
From: Enlightenment S. <no-...@en...> - 2009-10-13 03:12:49
|
Log: disable yuv for 6410 - seems theres a bug., use img shader instead just as a placeholder. Author: raster Date: 2009-10-12 20:12:32 -0700 (Mon, 12 Oct 2009) New Revision: 43047 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-13 01:44:46 UTC (rev 43046) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-13 03:12:32 UTC (rev 43047) @@ -113,11 +113,18 @@ &(shader_font_vert_src), &(shader_font_frag_src), "font"); +#if defined (GLES_VARIETY_S3C6410) evas_gl_common_shader_program_init(&(gc->shader.yuv), + &(shader_img_vert_src), + &(shader_img_frag_src), + "yuv"); +#else + evas_gl_common_shader_program_init(&(gc->shader.yuv), &(shader_yuv_vert_src), &(shader_yuv_frag_src), "yuv"); glUseProgram(gc->shader.yuv.prog); +#endif // in shader: // uniform sampler2D tex[8]; // |
From: Enlightenment S. <no-...@en...> - 2009-10-13 10:42:18
|
Log: fix font aligned tex. Author: raster Date: 2009-10-13 03:42:03 -0700 (Tue, 13 Oct 2009) New Revision: 43049 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_font.c trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_font.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_font.c 2009-10-13 09:40:39 UTC (rev 43048) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_font.c 2009-10-13 10:42:03 UTC (rev 43049) @@ -19,7 +19,7 @@ j = fg->glyph_out->bitmap.pitch; if (j < w) j = w; - nw = w; + nw = ((w + 3) / 4) * 4; ndata = alloca(nw *h); if (!ndata) return NULL; if (fg->glyph_out->bitmap.num_grays == 256) Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-13 09:40:39 UTC (rev 43048) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-13 10:42:03 UTC (rev 43049) @@ -350,15 +350,13 @@ #ifdef GL_UNPACK_ROW_LENGTH glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); #endif - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); glTexSubImage2D(GL_TEXTURE_2D, 0, tex->x, tex->y, w, h, GL_ALPHA, GL_UNSIGNED_BYTE, pixels); if (tex->pt->texture != tex->gc->shader.cur_tex) - { - glBindTexture(GL_TEXTURE_2D, tex->gc->shader.cur_tex); - } + glBindTexture(GL_TEXTURE_2D, tex->gc->shader.cur_tex); } Evas_GL_Texture * |
From: Enlightenment S. <no-...@en...> - 2009-10-22 08:53:35
|
Log: enable npot textures Author: raster Date: 2009-10-22 01:53:25 -0700 (Thu, 22 Oct 2009) New Revision: 43194 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c trunk/evas/src/modules/engines/gl_common/evas_gl_image.c trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-22 08:04:34 UTC (rev 43193) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-22 08:53:25 UTC (rev 43194) @@ -124,7 +124,9 @@ (strstr(ext, "OES_texture_npot"))) shared->info.tex_npo2 = 1; if ((strstr(ext, "GL_NV_texture_rectangle")) || - (strstr(ext, "GL_EXT_texture_rectangle"))) + (strstr(ext, "GL_EXT_texture_rectangle")) || + (strstr(ext, "GL_ARB_texture_rectangle")) + ) shared->info.tex_rect = 1; } glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_image.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_image.c 2009-10-22 08:04:34 UTC (rev 43193) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_image.c 2009-10-22 08:53:25 UTC (rev 43194) @@ -365,11 +365,11 @@ { if (yuv) evas_gl_common_context_yuv_push(gc, - im->tex, - sx, sy, sw, sh, - dx, dy, dw, dh, + im->tex, + sx, sy, sw, sh, + dx, dy, dw, dh, r, g, b, a, - smooth); + smooth); else evas_gl_common_context_image_push(gc, im->tex, Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-22 08:04:34 UTC (rev 43193) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-10-22 08:53:25 UTC (rev 43194) @@ -17,8 +17,7 @@ { unsigned int n; -// disable - has a bug somewhere -// if (gc->shared->info.tex_npo2) return; + if (gc->shared->info.tex_npo2) return; /*if (gc->shared->info.tex_rect) return;*/ *w = _nearest_pow2(*w); *h = _nearest_pow2(*h); @@ -27,8 +26,7 @@ static int _tex_round_slot(Evas_GL_Context *gc, int h) { -// disable. has a bug somewhere -// if (!gc->shared->info.tex_npo2) + if (!gc->shared->info.tex_npo2) h = _nearest_pow2(h); return (h + 15) >> 4; } @@ -59,6 +57,7 @@ pt = calloc(1, sizeof(Evas_GL_Texture_Pool)); if (!pt) return NULL; + h = _tex_round_slot(gc, h) << 4; _tex_adjust(gc, &w, &h); pt->gc = gc; pt->w = w; @@ -131,7 +130,7 @@ if ((w > 512) || (h > 512)) { - pt = _pool_tex_new(gc, w + 2, h + 1, format); + pt = _pool_tex_new(gc, w, h, format); gc->shared->tex.whole = eina_list_prepend(gc->shared->tex.whole, pt); pt->slot = -1; pt->fslot = -1; @@ -156,7 +155,8 @@ } } pt = _pool_tex_new(gc, atlas_w, h, format); - gc->shared->tex.atlas[th][th2] = eina_list_prepend(gc->shared->tex.atlas[th][th2], pt); + gc->shared->tex.atlas[th][th2] = + eina_list_prepend(gc->shared->tex.atlas[th][th2], pt); pt->slot = th; pt->fslot = th2; *u = 0; @@ -178,7 +178,7 @@ tex->gc = gc; tex->references = 1; // if (im->cache_entry.flags.alpha) - tex->pt = _pool_tex_find(gc, im->cache_entry.w + 3, + tex->pt = _pool_tex_find(gc, im->cache_entry.w + 2, im->cache_entry.h + 1, GL_RGBA, &u, &v, &l_after, 1024); // else |
From: Enlightenment S. <no-...@en...> - 2009-10-22 08:55:20
|
Log: re-enable yuv shader for 6410. Author: raster Date: 2009-10-22 01:55:07 -0700 (Thu, 22 Oct 2009) New Revision: 43195 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-22 08:53:25 UTC (rev 43194) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-10-22 08:55:07 UTC (rev 43195) @@ -176,13 +176,13 @@ &(shader_font_vert_src), &(shader_font_frag_src), "font"); -#if defined (GLES_VARIETY_S3C6410) +//#if defined (GLES_VARIETY_S3C6410) +// evas_gl_common_shader_program_init(&(shared->shader.yuv), +// &(shader_img_vert_src), +// &(shader_img_frag_src), +// "yuv"); +//#else evas_gl_common_shader_program_init(&(shared->shader.yuv), - &(shader_img_vert_src), - &(shader_img_frag_src), - "yuv"); -#else - evas_gl_common_shader_program_init(&(shared->shader.yuv), &(shader_yuv_vert_src), &(shader_yuv_frag_src), "yuv"); @@ -190,7 +190,7 @@ glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "tex"), 0); glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "texu"), 1); glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "texv"), 2); -#endif +//#endif // in shader: // uniform sampler2D tex[8]; // |
From: Enlightenment S. <no-...@en...> - 2009-10-23 13:11:41
|
Log: fix copy & paste bug. Author: raster Date: 2009-10-23 06:11:23 -0700 (Fri, 23 Oct 2009) New Revision: 43225 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c 2009-10-23 06:48:22 UTC (rev 43224) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_shader.c 2009-10-23 13:11:23 UTC (rev 43225) @@ -195,7 +195,7 @@ p->frag = glCreateShader(GL_FRAGMENT_SHADER); #if defined (GLES_VARIETY_S3C6410) glShaderBinary(1, &(p->vert), 0, vert->bin, vert->bin_size); - glShaderBinary(1, &(p->frag), 0, frag->bin, vert->bin_size); + glShaderBinary(1, &(p->frag), 0, frag->bin, frag->bin_size); #else glShaderSource(p->vert, 1, (const char **)&(vert->src), NULL); |
From: Enlightenment S. <no-...@en...> - 2009-11-03 10:33:50
|
Log: add a new npot extn string Author: raster Date: 2009-11-03 02:33:37 -0800 (Tue, 03 Nov 2009) New Revision: 43430 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-03 09:27:59 UTC (rev 43429) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-03 10:33:37 UTC (rev 43430) @@ -121,7 +121,8 @@ { fprintf(stderr, "EXT:\n%s\n", ext); if ((strstr(ext, "GL_ARB_texture_non_power_of_two")) || - (strstr(ext, "OES_texture_npot"))) + (strstr(ext, "OES_texture_npot")) || + (strstr(ext, "GL_IMG_texture_npot"))) shared->info.tex_npo2 = 1; if ((strstr(ext, "GL_NV_texture_rectangle")) || (strstr(ext, "GL_EXT_texture_rectangle")) || |
From: Enlightenment S. <no-...@en...> - 2009-11-06 15:13:43
|
Log: fix - remove typedefs of gl stuff. not needed. Author: raster Date: 2009-11-06 07:13:29 -0800 (Fri, 06 Nov 2009) New Revision: 43488 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-06 11:32:23 UTC (rev 43487) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-06 15:13:29 UTC (rev 43488) @@ -83,27 +83,15 @@ } static void -_tex_2d(GLint internalformat, - GLsizei width, - GLsizei height, - GLenum format, - GLenum type) +_tex_2d(int intfmt, int w, int h, int fmt, int type) { - glTexImage2D(GL_TEXTURE_2D, 0, internalformat, - width, height, 0, format, type, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, intfmt, w, h, 0, fmt, type, NULL); } static void -_tex_sub_2d(GLint xoffset, - GLint yoffset, - GLsizei width, - GLsizei height, - GLenum format, - GLenum type, - const GLvoid *pixels) +_tex_sub_2d(int x, int y, int w, int h, int fmt, int type, const void *pix) { - glTexSubImage2D(GL_TEXTURE_2D, 0, - xoffset, yoffset, width, height, format, type, pixels); + glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, fmt, type, pix); } static Evas_GL_Texture_Pool * |
From: Enlightenment S. <no-...@en...> - 2009-11-06 15:14:49
|
Log: remove 2 more types Author: raster Date: 2009-11-06 07:14:34 -0800 (Fri, 06 Nov 2009) New Revision: 43489 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-06 15:13:29 UTC (rev 43488) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-06 15:14:34 UTC (rev 43489) @@ -95,8 +95,7 @@ } static Evas_GL_Texture_Pool * -_pool_tex_new(Evas_GL_Context *gc, int w, int h, - GLenum intformat, GLenum format) +_pool_tex_new(Evas_GL_Context *gc, int w, int h, int intformat, int format) { Evas_GL_Texture_Pool *pt; |
From: Enlightenment S. <no-...@en...> - 2009-11-06 15:15:27
|
Log: 2 more! Author: raster Date: 2009-11-06 07:15:12 -0800 (Fri, 06 Nov 2009) New Revision: 43490 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-06 15:14:34 UTC (rev 43489) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-06 15:15:12 UTC (rev 43490) @@ -168,7 +168,7 @@ static Evas_GL_Texture_Pool * _pool_tex_find(Evas_GL_Context *gc, int w, int h, - GLuint intformat, GLuint format, int *u, int *v, + int intformat, int format, int *u, int *v, Eina_List **l_after, int atlas_w) { Evas_GL_Texture_Pool *pt = NULL; |
From: Enlightenment S. <no-...@en...> - 2009-11-13 07:25:21
|
Log: del fbo as well if it exists Author: raster Date: 2009-11-12 23:25:08 -0800 (Thu, 12 Nov 2009) New Revision: 43654 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 07:22:31 UTC (rev 43653) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 07:25:08 UTC (rev 43654) @@ -382,6 +382,7 @@ eina_list_remove(pt->gc->shared->tex.atlas[pt->slot][pt->fslot], pt); } glDeleteTextures(1, &(pt->texture)); + if (pt->fb) glDeleteFramebuffersEXT(1, &(pt->fb)); free(pt); } |
From: Enlightenment S. <no-...@en...> - 2009-11-13 07:30:15
|
Log: fix disabling of blendipoos! Author: raster Date: 2009-11-12 23:30:03 -0800 (Thu, 12 Nov 2009) New Revision: 43655 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 07:25:08 UTC (rev 43654) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 07:30:03 UTC (rev 43655) @@ -703,13 +703,6 @@ glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, gc->shader.cur_tex); } - if (gc->shader.blend != gc->shader.current.blend) - { - if (gc->shader.blend) - glEnable(GL_BLEND); - else - glDisable(GL_BLEND); - } if (gc->shader.render_op != gc->shader.current.render_op) { switch (gc->shader.render_op) @@ -718,7 +711,7 @@ glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); break; case EVAS_RENDER_COPY: /**< d = s */ - glDisable(GL_BLEND); + gc->shader.blend = 0; glBlendFunc(GL_ONE, GL_ONE); break; // FIXME: fix blend funcs below! @@ -737,6 +730,13 @@ break; } } + if (gc->shader.blend != gc->shader.current.blend) + { + if (gc->shader.blend) + glEnable(GL_BLEND); + else + glDisable(GL_BLEND); + } if (gc->shader.smooth != gc->shader.current.smooth) { if (gc->shader.smooth) |
From: Enlightenment S. <no-...@en...> - 2009-11-13 08:19:27
|
Log: and now complex stuff works..... woot! Author: raster Date: 2009-11-13 00:19:13 -0800 (Fri, 13 Nov 2009) New Revision: 43656 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 07:30:03 UTC (rev 43655) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 08:19:13 UTC (rev 43656) @@ -80,10 +80,11 @@ h = gc->shader.surface->h; m = -1; } - + if ((!gc->change.size) || - ((gc->shared->w == w) && (gc->shared->h == gc->h))) + ((gc->shared->w == w) && (gc->shared->h == h))) return; + gc->shared->w = w; gc->shared->h = h; gc->change.size = 0; @@ -91,10 +92,8 @@ glViewport(0, 0, w, h); matrix_ident(proj); - if (m == 1) - matrix_ortho(proj, 0, w, 0, h, -1.0, 1.0); - else - matrix_ortho(proj, 0, w, h, 0, -1.0, 1.0); + if (m == 1) matrix_ortho(proj, 0, w, 0, h, -1.0, 1.0); + else matrix_ortho(proj, 0, w, h, 0, -1.0, 1.0); glUseProgram(gc->shared->shader.rect.prog); glUniformMatrix4fv(glGetUniformLocation(gc->shared->shader.rect.prog, "mvp"), 1, @@ -307,13 +306,9 @@ // FIXME: viewport goopies gc->change.size = 1; if (gc->shader.surface == gc->def_surface) - { - glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); - } + glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); else - { - glBindFramebuffer(GL_FRAMEBUFFER_EXT, surface->tex->pt->fb); - } + glBindFramebuffer(GL_FRAMEBUFFER_EXT, surface->tex->pt->fb); _evas_gl_common_viewport_set(gc); #endif } |
From: Enlightenment S. <no-...@en...> - 2009-11-13 08:38:22
|
Log: fix color stuff.. next.. need to fix z stuff. Author: raster Date: 2009-11-13 00:38:12 -0800 (Fri, 13 Nov 2009) New Revision: 43658 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 08:28:47 UTC (rev 43657) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 08:38:12 UTC (rev 43658) @@ -110,6 +110,7 @@ glUseProgram(gc->shared->shader.tex.prog); glUniformMatrix4fv(glGetUniformLocation(gc->shared->shader.tex.prog, "mvp"), 1, GL_FALSE, proj); + glUseProgram(gc->shader.cur_prog); } Evas_GL_Context * @@ -213,6 +214,7 @@ glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "tex"), 0); glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "texu"), 1); glUniform1i(glGetUniformLocation(shared->shader.yuv.prog, "texv"), 2); + glUseProgram(gc->shader.cur_prog); // in shader: // uniform sampler2D tex[8]; // @@ -669,6 +671,7 @@ PUSH_VERTEX((p[points[i]].x >> FP), (p[points[i]].y >> FP), 0); +// (p[points[i]].y >> FP) + 4096); // (p[points[i]].z >> FP)); PUSH_TEXUV(tx[points[i]], ty[points[i]]); |
From: Enlightenment S. <no-...@en...> - 2009-11-13 08:44:01
|
Log: on paper.. go gles2 too... that should work.. in theory. need to test. Author: raster Date: 2009-11-13 00:43:50 -0800 (Fri, 13 Nov 2009) New Revision: 43659 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 08:38:12 UTC (rev 43658) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 08:43:50 UTC (rev 43659) @@ -309,10 +309,17 @@ #else // FIXME: viewport goopies gc->change.size = 1; +#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) if (gc->shader.surface == gc->def_surface) + glBindFramebuffer(GL_FRAMEBUFFER_OES, 0); + else + glBindFramebuffer(GL_FRAMEBUFFER_OES, surface->tex->pt->fb); +#else + if (gc->shader.surface == gc->def_surface) glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); else glBindFramebuffer(GL_FRAMEBUFFER_EXT, surface->tex->pt->fb); +#endif _evas_gl_common_viewport_set(gc); #endif } Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 08:38:12 UTC (rev 43658) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 08:43:50 UTC (rev 43659) @@ -269,7 +269,18 @@ pt->dataformat = GL_UNSIGNED_BYTE; pt->references = 0; #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) - // FIXME: XXX render-to-texture for gles2 + glGenTextures(1, &(pt->texture)); + glBindTexture(GL_TEXTURE_2D, pt->texture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + _tex_2d(pt->intformat, w, h, pt->format, pt->dataformat); + glGenFramebuffers(1, &(pt->fb)); + glBindFramebuffer(GL_FRAMEBUFFER_OES, pt->fb); + glFramebufferTexture2DEXT(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_TEXTURE_2D, pt->texture, 0); + glBindFramebufferEXT(GL_FRAMEBUFFER_OES, 0); + glBindTexture(GL_TEXTURE_2D, gc->shader.cur_tex); #else glGenTextures(1, &(pt->texture)); glBindTexture(GL_TEXTURE_2D, pt->texture); |
From: Enlightenment S. <no-...@en...> - 2009-11-13 11:30:43
|
Log: fix gles defs Author: raster Date: 2009-11-13 03:30:28 -0800 (Fri, 13 Nov 2009) New Revision: 43660 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_context.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 08:43:50 UTC (rev 43659) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_context.c 2009-11-13 11:30:28 UTC (rev 43660) @@ -304,24 +304,21 @@ evas_gl_common_context_flush(gc); gc->shader.surface = surface; -#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) - // FIXME: XXX render-to-texture for gles2 -#else - // FIXME: viewport goopies gc->change.size = 1; #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) - if (gc->shader.surface == gc->def_surface) - glBindFramebuffer(GL_FRAMEBUFFER_OES, 0); - else - glBindFramebuffer(GL_FRAMEBUFFER_OES, surface->tex->pt->fb); +# ifndef GL_FRAMEBUFFER +# define GL_FRAMEBUFFER GL_FRAMEBUFFER_OES +# endif #else +# ifndef GL_FRAMEBUFFER +# define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT +# endif +#endif if (gc->shader.surface == gc->def_surface) - glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); + glBindFramebuffer(GL_FRAMEBUFFER, 0); else - glBindFramebuffer(GL_FRAMEBUFFER_EXT, surface->tex->pt->fb); -#endif + glBindFramebuffer(GL_FRAMEBUFFER, surface->tex->pt->fb); _evas_gl_common_viewport_set(gc); -#endif } #define PUSH_VERTEX(x, y, z) \ Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 08:43:50 UTC (rev 43659) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 11:30:28 UTC (rev 43660) @@ -269,19 +269,20 @@ pt->dataformat = GL_UNSIGNED_BYTE; pt->references = 0; #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) - glGenTextures(1, &(pt->texture)); - glBindTexture(GL_TEXTURE_2D, pt->texture); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - _tex_2d(pt->intformat, w, h, pt->format, pt->dataformat); - glGenFramebuffers(1, &(pt->fb)); - glBindFramebuffer(GL_FRAMEBUFFER_OES, pt->fb); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_TEXTURE_2D, pt->texture, 0); - glBindFramebufferEXT(GL_FRAMEBUFFER_OES, 0); - glBindTexture(GL_TEXTURE_2D, gc->shader.cur_tex); +# ifndef GL_FRAMEBUFFER +# define GL_FRAMEBUFFER GL_FRAMEBUFFER_OES +# endif +# ifndef GL_COLOR_ATTACHMENT0 +# define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_OES +# endif #else +# ifndef GL_FRAMEBUFFER +# define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT +# endif +# ifndef GL_COLOR_ATTACHMENT0 +# define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT +# endif +#endif glGenTextures(1, &(pt->texture)); glBindTexture(GL_TEXTURE_2D, pt->texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -290,11 +291,10 @@ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); _tex_2d(pt->intformat, w, h, pt->format, pt->dataformat); glGenFramebuffers(1, &(pt->fb)); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, pt->fb); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, pt->texture, 0); - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + glBindFramebuffer(GL_FRAMEBUFFER, pt->fb); + glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, pt->texture, 0); + glBindFramebufferEXT(GL_FRAMEBUFFER, 0); glBindTexture(GL_TEXTURE_2D, gc->shader.cur_tex); -#endif return pt; } |
From: Enlightenment S. <no-...@en...> - 2009-11-13 12:31:45
|
Log: fix gles symbols Author: raster Date: 2009-11-13 04:31:31 -0800 (Fri, 13 Nov 2009) New Revision: 43662 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 11:34:36 UTC (rev 43661) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 12:31:31 UTC (rev 43662) @@ -292,8 +292,8 @@ _tex_2d(pt->intformat, w, h, pt->format, pt->dataformat); glGenFramebuffers(1, &(pt->fb)); glBindFramebuffer(GL_FRAMEBUFFER, pt->fb); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, pt->texture, 0); - glBindFramebufferEXT(GL_FRAMEBUFFER, 0); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, pt->texture, 0); + glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindTexture(GL_TEXTURE_2D, gc->shader.cur_tex); return pt; } @@ -393,7 +393,7 @@ eina_list_remove(pt->gc->shared->tex.atlas[pt->slot][pt->fslot], pt); } glDeleteTextures(1, &(pt->texture)); - if (pt->fb) glDeleteFramebuffersEXT(1, &(pt->fb)); + if (pt->fb) glDeleteFramebuffers(1, &(pt->fb)); free(pt); } |
From: Enlightenment S. <no-...@en...> - 2009-11-14 05:08:11
|
Log: fix font alloc bug! Author: raster Date: 2009-11-13 21:08:00 -0800 (Fri, 13 Nov 2009) New Revision: 43686 Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_image.c trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_image.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_image.c 2009-11-13 23:59:46 UTC (rev 43685) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_image.c 2009-11-14 05:08:00 UTC (rev 43686) @@ -301,7 +301,9 @@ } _evas_gl_common_image_update(gc, im); - + + // FIXME: need to handle clipping with a scissor. only sane way to do it. + glFlush(); c = gc->dc->clip.use; Modified: trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c =================================================================== --- trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-13 23:59:46 UTC (rev 43685) +++ trunk/evas/src/modules/engines/gl_common/evas_gl_texture.c 2009-11-14 05:08:00 UTC (rev 43686) @@ -384,14 +384,10 @@ pt->references--; if (pt->references > 0) return; if (pt->whole) - { - pt->gc->shared->tex.whole = eina_list_remove(pt->gc->shared->tex.whole, pt); - } + pt->gc->shared->tex.whole = eina_list_remove(pt->gc->shared->tex.whole, pt); else - { - pt->gc->shared->tex.atlas [pt->slot][pt->fslot] = - eina_list_remove(pt->gc->shared->tex.atlas[pt->slot][pt->fslot], pt); - } + pt->gc->shared->tex.atlas [pt->slot][pt->fslot] = + eina_list_remove(pt->gc->shared->tex.atlas[pt->slot][pt->fslot], pt); glDeleteTextures(1, &(pt->texture)); if (pt->fb) glDeleteFramebuffers(1, &(pt->fb)); free(pt); @@ -411,7 +407,8 @@ } Evas_GL_Texture * -evas_gl_common_texture_alpha_new(Evas_GL_Context *gc, DATA8 *pixels, int w, int h, int fh) +evas_gl_common_texture_alpha_new(Evas_GL_Context *gc, DATA8 *pixels, + int w, int h, int fh) { Evas_GL_Texture *tex; Eina_List *l_after = NULL; @@ -425,7 +422,8 @@ tex->references = 1; if (tw > gc->shared->info.max_texture_size) tw = gc->shared->info.max_texture_size; - tex->pt = _pool_tex_find(gc, w + 3, fh, alpha_ifmt, alpha_fmt, &u, &v, &l_after, tw); + tex->pt = _pool_tex_find(gc, w + 3, fh, alpha_ifmt, alpha_fmt, &u, &v, + &l_after, tw); if (!tex->pt) { free(tex); @@ -436,7 +434,8 @@ tex->w = w; tex->h = h; if (l_after) - tex->pt->allocations = eina_list_append_relative(tex->pt->allocations, tex, l_after); + tex->pt->allocations = + eina_list_append_relative_list(tex->pt->allocations, tex, l_after); else tex->pt->allocations = eina_list_prepend(tex->pt->allocations, tex); tex->pt->references++; @@ -445,14 +444,16 @@ } void -evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels, int w, int h, int fh) +evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels, + int w, int h, int fh) { glBindTexture(GL_TEXTURE_2D, tex->pt->texture); #ifdef GL_UNPACK_ROW_LENGTH glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); #endif glPixelStorei(GL_UNPACK_ALIGNMENT, 4); - _tex_sub_2d(tex->x, tex->y, w, h, tex->pt->format, tex->pt->dataformat, pixels); + _tex_sub_2d(tex->x, tex->y, w, h, tex->pt->format, tex->pt->dataformat, + pixels); if (tex->pt->texture != tex->gc->shader.cur_tex) glBindTexture(GL_TEXTURE_2D, tex->gc->shader.cur_tex); } |