From 798d1b8816fed0a88674c6d89d56e478519a5a55 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 14 Sep 2016 13:51:19 -0700 Subject: [PATCH] glsl/standalone: Use API_OPENGL_CORE if the GLSL version is >= 1.40 Otherwise extensions to 1.40 that are only for core profile won't work. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/compiler/glsl/standalone.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/glsl/standalone.cpp b/src/compiler/glsl/standalone.cpp index d6e68291977..a7e625489f3 100644 --- a/src/compiler/glsl/standalone.cpp +++ b/src/compiler/glsl/standalone.cpp @@ -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; -- 2.30.2