GL: reset GL context's current program to cairo's shader

When cairo's GL context is used by external libraries or applications,
it is possible that GL context's current program is changed.  When we
detect such changes, we must reset GL context's current program to cairo
current shader

Change-Id: Ifeadbff488200b5a8bcc5014bda9bf5c0f8df3a8
Signed-off-by: nisanthmp <nisanth.mp@samsung.com>

diff --git a/src/cairo-gl-device.c b/src/cairo-gl-device.c
index dbb6f162f7dd2b5a3bcf84582de8b3a3c78a7892..b98c7693024300242494535d7f3f6a0262589054 100644 (file)
--- a/src/cairo-gl-device.c
+++ b/src/cairo-gl-device.c
@@ -1105,6 +1105,16 @@ cairo_gl_device_set_thread_aware (cairo_device_t *device,
 
 void _cairo_gl_context_reset (cairo_gl_context_t *ctx)
 {
+    cairo_gl_shader_t *shader = ctx->current_shader;
+    /* reset current shader, this is because if cairo shares a same
+     * context other extern libraries or applications, the current
+     * program may well be changed, in this case, we must set cairo
+     * to use cairo program
+     */
+    ctx->current_shader = NULL;
+    if (shader)
+       _cairo_gl_set_shader (ctx, shader);
+
     ctx->states_cache.viewport_box.width = 0;
     ctx->states_cache.viewport_box.height = 0;
 
@@ -1127,8 +1137,6 @@ void _cairo_gl_context_reset (cairo_gl_context_t *ctx)
     /* FIXME:  this is hack to fix mali driver */
     ctx->dispatch.Disable (GL_DITHER);
 
-    ctx->current_shader = NULL;
-
     ctx->states_cache.bound_vbo = 0;
     ctx->states_cache.bound_vao = 0;
     ctx->states_cache.bound_ibo = 0;