[PATCH 4/8] glamor: Fix attempting to compile shaders with no active context.

Eric Anholt eric at anholt.net
Mon Feb 3 10:36:45 PST 2014


Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 5246c98..5883809 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -215,6 +215,7 @@ glamor_init_finish_access_shaders(ScreenPtr screen)
     char *source;
 
     glamor_priv = glamor_get_screen_private(screen);
+    glamor_get_context(glamor_priv);
     glamor_priv->finish_access_prog[0] = glCreateProgram();
     glamor_priv->finish_access_prog[1] = glCreateProgram();
 
@@ -234,7 +235,6 @@ glamor_init_finish_access_shaders(ScreenPtr screen)
                                               source);
     free(source);
 
-    glamor_get_context(glamor_priv);
     glAttachShader(glamor_priv->finish_access_prog[1], avs_prog);
     glAttachShader(glamor_priv->finish_access_prog[1], set_alpha_prog);
 
-- 
1.9.rc1



More information about the xorg-devel mailing list