From a6facced8d6a17ed26b103d995a2d61e772aaa8b Mon Sep 17 00:00:00 2001 From: Alexandros Frantzis Date: Wed, 8 Dec 2010 14:39:31 +0200 Subject: [PATCH] gl: Use the GL core 2.0 shader implementation for both GL 1.x ARB and GL 2.x The GL core 2.0 shader implementation can be used by both GL 1.x and 2.x thanks to the dispatch table. --- src/cairo-gl-shaders.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c index 06e3c62ab..909b68140 100644 --- a/src/cairo-gl-shaders.c +++ b/src/cairo-gl-shaders.c @@ -543,12 +543,11 @@ _cairo_gl_context_init_shaders (cairo_gl_context_t *ctx) cairo_status_t status; /* XXX multiple device support? */ - if (GLEW_VERSION_2_0) { + if (GLEW_VERSION_2_0 || + (GLEW_ARB_shader_objects && + GLEW_ARB_fragment_shader && + GLEW_ARB_vertex_program)) { ctx->shader_impl = &shader_impl_core_2_0; - } else if (GLEW_ARB_shader_objects && - GLEW_ARB_fragment_shader && - GLEW_ARB_vertex_program) { - ctx->shader_impl = &shader_impl_arb; } else { ctx->shader_impl = NULL; }