From 3e1fa16c035e131b0d08831b6361ae251598b7eb Mon Sep 17 00:00:00 2001 From: raster Date: Wed, 12 Oct 2011 10:27:17 +0000 Subject: [PATCH] fix gl pipeline problem with textures and map and the wrong program id being set/restored. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@64014 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/gl_common/evas_gl_context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/modules/engines/gl_common/evas_gl_context.c b/src/modules/engines/gl_common/evas_gl_context.c index 36eeab2..7ee41ee 100644 --- a/src/modules/engines/gl_common/evas_gl_context.c +++ b/src/modules/engines/gl_common/evas_gl_context.c @@ -454,7 +454,7 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc) GLERR(__FUNCTION__, __FILE__, __LINE__, ""); } - glUseProgram(gc->pipe[0].shader.cur_prog); + glUseProgram(gc->state.current.cur_prog); GLERR(__FUNCTION__, __FILE__, __LINE__, ""); } @@ -703,7 +703,7 @@ evas_gl_common_context_new(void) SHADER_TEXTURE_ADD(shared, IMG_MASK, tex); SHADER_TEXTURE_ADD(shared, IMG_MASK, texm); - glUseProgram(gc->pipe[0].shader.cur_prog); + glUseProgram(gc->state.current.cur_prog); GLERR(__FUNCTION__, __FILE__, __LINE__, ""); evas_gl_common_shader_program_init_done(); @@ -891,7 +891,7 @@ evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc) GLERR(__FUNCTION__, __FILE__, __LINE__, ""); glEnableVertexAttribArray(SHAD_COLOR); GLERR(__FUNCTION__, __FILE__, __LINE__, ""); - glUseProgram(gc->pipe[0].shader.cur_prog); + glUseProgram(gc->state.current.cur_prog); GLERR(__FUNCTION__, __FILE__, __LINE__, ""); glActiveTexture(GL_TEXTURE0); @@ -2184,7 +2184,6 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc, blend, smooth, clip, cx, cy, cw, ch); - gc->pipe[pn].region.type = RTYPE_MAP; gc->pipe[pn].shader.cur_tex = tex->pt->texture; if (utexture) @@ -2648,14 +2647,14 @@ shader_array_flush(Evas_Engine_GL_Context *gc) gc->state.current.cur_prog = gc->pipe[i].shader.cur_prog; gc->state.current.cur_tex = gc->pipe[i].shader.cur_tex; - gc->state.current.blend = gc->pipe[i].shader.blend; - gc->state.current.smooth = gc->pipe[i].shader.smooth; gc->state.current.render_op = gc->pipe[i].shader.render_op; - gc->state.current.clip = gc->pipe[i].shader.clip; gc->state.current.cx = gc->pipe[i].shader.cx; gc->state.current.cy = gc->pipe[i].shader.cy; gc->state.current.cw = gc->pipe[i].shader.cw; gc->state.current.ch = gc->pipe[i].shader.ch; + gc->state.current.smooth = gc->pipe[i].shader.smooth; + gc->state.current.blend = gc->pipe[i].shader.blend; + gc->state.current.clip = gc->pipe[i].shader.clip; if (gc->pipe[i].array.vertex) free(gc->pipe[i].array.vertex); if (gc->pipe[i].array.color) free(gc->pipe[i].array.color); -- 2.7.4