glsl/standalone: Use API_OPENGL_CORE if the GLSL version is >= 1.40
authorIan Romanick <ian.d.romanick@intel.com>
Wed, 14 Sep 2016 20:51:19 +0000 (13:51 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 27 Sep 2016 19:06:46 +0000 (12:06 -0700)
Otherwise extensions to 1.40 that are only for core profile won't work.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/compiler/glsl/standalone.cpp

index d6e68291977bbf702cd2382fde9bf232b340ed1c..a7e625489f387389385b9606620bc89e70a9c2f1 100644 (file)
@@ -331,7 +331,11 @@ standalone_compile_shader(const struct standalone_options *_options,
       return NULL;
    }
 
-   initialize_context(ctx, (glsl_es) ? API_OPENGLES2 : API_OPENGL_COMPAT);
+   if (glsl_es) {
+      initialize_context(ctx, API_OPENGLES2);
+   } else {
+      initialize_context(ctx, options->glsl_version > 130 ? API_OPENGL_CORE : API_OPENGL_COMPAT);
+   }
 
    struct gl_shader_program *whole_program;