X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fversion.c;h=8bc00ace5c483b3741d34fb26f884f34a68b4e8d;hb=8af11afc38532c65a242f7d45c31cf098ce2fa2f;hp=16185bffc919e2ab4dd2b8123ac7b5dc54717107;hpb=338ea2e4d14b5bf30fe2820facd71333d5acd527;p=mesa.git

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 16185bffc91..8bc00ace5c4 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -23,6 +23,7 @@
  */
 
 
+#include <stdio.h>
 #include "imports.h"
 #include "mtypes.h"
 #include "version.h"
@@ -31,23 +32,16 @@
 /**
  * Scans 'string' to see if it ends with 'ending'.
  */
-static GLboolean
+static bool
 check_for_ending(const char *string, const char *ending)
 {
-   int len1, len2;
+   const size_t len1 = strlen(string);
+   const size_t len2 = strlen(ending);
 
-   len1 = strlen(string);
-   len2 = strlen(ending);
+   if (len2 > len1)
+      return false;
 
-   if (len2 > len1) {
-      return GL_FALSE;
-   }
-
-   if (strcmp(string + (len1 - len2), ending) == 0) {
-      return GL_TRUE;
-   } else {
-      return GL_FALSE;
-   }
+   return strcmp(string + (len1 - len2), ending) == 0;
 }
 
 /**
@@ -57,36 +51,62 @@ check_for_ending(const char *string, const char *ending)
  * fwd_context is only valid if version > 0
  */
 static void
-get_gl_override(int *version, GLboolean *fwd_context)
+get_gl_override(gl_api api, int *version, bool *fwd_context,
+                bool *compat_context)
 {
-   const char *env_var = "MESA_GL_VERSION_OVERRIDE";
+   const char *env_var = (api == API_OPENGL_CORE || api == API_OPENGL_COMPAT)
+      ? "MESA_GL_VERSION_OVERRIDE" : "MESA_GLES_VERSION_OVERRIDE";
    const char *version_str;
    int major, minor, n;
-   static int override_version = -1;
-   static GLboolean fc_suffix = GL_FALSE;
+   static struct override_info {
+      int version;
+      bool fc_suffix;
+      bool compat_suffix;
+   } override[] = {
+      { -1, false, false},
+      { -1, false, false},
+      { -1, false, false},
+      { -1, false, false},
+   };
 
-   if (override_version < 0) {
-      override_version = 0;
+   STATIC_ASSERT(ARRAY_SIZE(override) == API_OPENGL_LAST + 1);
+
+   if (api == API_OPENGLES)
+      goto exit;
+
+   if (override[api].version < 0) {
+      override[api].version = 0;
 
       version_str = getenv(env_var);
       if (version_str) {
-         fc_suffix = check_for_ending(version_str, "FC");
+         override[api].fc_suffix = check_for_ending(version_str, "FC");
+         override[api].compat_suffix = check_for_ending(version_str, "COMPAT");
 
          n = sscanf(version_str, "%u.%u", &major, &minor);
          if (n != 2) {
-            fprintf(stderr, "error: invalid value for %s: %s\n", env_var, version_str);
-            override_version = 0;
+            fprintf(stderr, "error: invalid value for %s: %s\n",
+                    env_var, version_str);
+            override[api].version = 0;
          } else {
-            override_version = major * 10 + minor;
-            if (override_version < 30 && fc_suffix) {
-               fprintf(stderr, "error: invalid value for %s: %s\n", env_var, version_str);
+            override[api].version = major * 10 + minor;
+
+            /* There is no such thing as compatibility or forward-compatible for
+             * OpenGL ES 2.0 or 3.x APIs.
+             */
+            if ((override[api].version < 30 && override[api].fc_suffix) ||
+                (api == API_OPENGLES2 && (override[api].fc_suffix ||
+                                          override[api].compat_suffix))) {
+               fprintf(stderr, "error: invalid value for %s: %s\n",
+                       env_var, version_str);
             }
          }
       }
    }
 
-   *version = override_version;
-   *fwd_context = fc_suffix;
+exit:
+   *version = override[api].version;
+   *fwd_context = override[api].fc_suffix;
+   *compat_context = override[api].compat_suffix;
 }
 
 /**
@@ -124,42 +144,45 @@ create_version_string(struct gl_context *ctx, const char *prefix)
  * 3.1: select a Core profile with GL version 3.1
  * 3.1FC: select a Core+Forward Compatible profile with GL version 3.1
  */
-void
-_mesa_override_gl_version(struct gl_context *ctx)
+bool
+_mesa_override_gl_version_contextless(struct gl_constants *consts,
+                                      gl_api *apiOut, GLuint *versionOut)
 {
    int version;
-   GLboolean fwd_context;
+   bool fwd_context, compat_context;
 
-   get_gl_override(&version, &fwd_context);
+   get_gl_override(*apiOut, &version, &fwd_context, &compat_context);
 
    if (version > 0) {
-      ctx->Version = version;
-      if (version >= 30 && fwd_context) {
-         ctx->API = API_OPENGL_CORE;
-         ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT;
-      } else if (version >= 31) {
-         ctx->API = API_OPENGL_CORE;
-      } else {
-         ctx->API = API_OPENGL_COMPAT;
+      *versionOut = version;
+
+      /* If the API is a desktop API, adjust the context flags.  We may also
+       * need to modify the API depending on the version.  For example, Mesa
+       * does not support a GL 3.3 compatibility profile.
+       */
+      if (*apiOut == API_OPENGL_CORE || *apiOut == API_OPENGL_COMPAT) {
+         if (version >= 30 && fwd_context) {
+            *apiOut = API_OPENGL_CORE;
+            consts->ContextFlags |= GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT;
+         } else if (version >= 31 && !compat_context) {
+            *apiOut = API_OPENGL_CORE;
+         } else {
+            *apiOut = API_OPENGL_COMPAT;
+         }
       }
-      create_version_string(ctx, "");
+
+      return true;
    }
+   return false;
 }
 
-/**
- * Returns the gl override value
- *
- * version > 0 indicates there is an override requested
- */
-int
-_mesa_get_gl_version_override(void)
+void
+_mesa_override_gl_version(struct gl_context *ctx)
 {
-   int version;
-   GLboolean fwd_context;
-
-   get_gl_override(&version, &fwd_context);
-
-   return version;
+   if (_mesa_override_gl_version_contextless(&ctx->Const, &ctx->API,
+                                             &ctx->Version)) {
+      create_version_string(ctx, "");
+   }
 }
 
 /**
@@ -168,7 +191,7 @@ _mesa_get_gl_version_override(void)
  * MESA_GLSL_VERSION_OVERRIDE are integers, such as "130".
  */
 void
-_mesa_override_glsl_version(struct gl_context *ctx)
+_mesa_override_glsl_version(struct gl_constants *consts)
 {
    const char *env_var = "MESA_GLSL_VERSION_OVERRIDE";
    const char *version;
@@ -179,7 +202,7 @@ _mesa_override_glsl_version(struct gl_context *ctx)
       return;
    }
 
-   n = sscanf(version, "%u", &ctx->Const.GLSLVersion);
+   n = sscanf(version, "%u", &consts->GLSLVersion);
    if (n != 1) {
       fprintf(stderr, "error: invalid value for %s: %s\n", env_var, version);
       return;
@@ -189,101 +212,141 @@ _mesa_override_glsl_version(struct gl_context *ctx)
 /**
  * Examine enabled GL extensions to determine GL version.
  */
-static void
-compute_version(struct gl_context *ctx)
+static GLuint
+compute_version(const struct gl_extensions *extensions,
+                const struct gl_constants *consts, gl_api api)
 {
-   GLuint major, minor;
-
-   const GLboolean ver_1_3 = (ctx->Extensions.ARB_texture_border_clamp &&
-                              ctx->Extensions.ARB_texture_cube_map &&
-                              ctx->Extensions.ARB_texture_env_combine &&
-                              ctx->Extensions.ARB_texture_env_dot3);
-   const GLboolean ver_1_4 = (ver_1_3 &&
-                              ctx->Extensions.ARB_depth_texture &&
-                              ctx->Extensions.ARB_shadow &&
-                              ctx->Extensions.ARB_texture_env_crossbar &&
-                              ctx->Extensions.EXT_blend_color &&
-                              ctx->Extensions.EXT_blend_func_separate &&
-                              ctx->Extensions.EXT_blend_minmax &&
-                              ctx->Extensions.EXT_point_parameters);
-   const GLboolean ver_1_5 = (ver_1_4 &&
-                              ctx->Extensions.ARB_occlusion_query &&
-                              ctx->Extensions.EXT_shadow_funcs);
-   const GLboolean ver_2_0 = (ver_1_5 &&
-                              ctx->Extensions.ARB_point_sprite &&
-                              ctx->Extensions.ARB_shader_objects &&
-                              ctx->Extensions.ARB_vertex_shader &&
-                              ctx->Extensions.ARB_fragment_shader &&
-                              ctx->Extensions.ARB_texture_non_power_of_two &&
-                              ctx->Extensions.EXT_blend_equation_separate &&
-
-			      /* Technically, 2.0 requires the functionality
-			       * of the EXT version.  Enable 2.0 if either
-			       * extension is available, and assume that a
-			       * driver that only exposes the ATI extension
-			       * will fallback to software when necessary.
-			       */
-			      (ctx->Extensions.EXT_stencil_two_side
-			       || ctx->Extensions.ATI_separate_stencil));
-   const GLboolean ver_2_1 = (ver_2_0 &&
-                              ctx->Const.GLSLVersion >= 120 &&
-                              ctx->Extensions.EXT_pixel_buffer_object &&
-                              ctx->Extensions.EXT_texture_sRGB);
-   const GLboolean ver_3_0 = (ver_2_1 &&
-                              ctx->Const.GLSLVersion >= 130 &&
-                              ctx->Const.MaxSamples >= 4 &&
-                              (ctx->API == API_OPENGL_CORE ||
-                               ctx->Extensions.ARB_color_buffer_float) &&
-                              ctx->Extensions.ARB_depth_buffer_float &&
-                              ctx->Extensions.ARB_half_float_pixel &&
-                              ctx->Extensions.ARB_half_float_vertex &&
-                              ctx->Extensions.ARB_map_buffer_range &&
-                              ctx->Extensions.ARB_shader_texture_lod &&
-                              ctx->Extensions.ARB_texture_float &&
-                              ctx->Extensions.ARB_texture_rg &&
-                              ctx->Extensions.ARB_texture_compression_rgtc &&
-                              ctx->Extensions.EXT_draw_buffers2 &&
-                              ctx->Extensions.ARB_framebuffer_object &&
-                              ctx->Extensions.EXT_framebuffer_sRGB &&
-                              ctx->Extensions.EXT_packed_float &&
-                              ctx->Extensions.EXT_texture_array &&
-                              ctx->Extensions.EXT_texture_shared_exponent &&
-                              ctx->Extensions.EXT_transform_feedback &&
-                              ctx->Extensions.NV_conditional_render);
-   const GLboolean ver_3_1 = (ver_3_0 &&
-                              ctx->Const.GLSLVersion >= 140 &&
-                              ctx->Extensions.ARB_draw_instanced &&
-                              ctx->Extensions.ARB_texture_buffer_object &&
-                              ctx->Extensions.ARB_uniform_buffer_object &&
-                              ctx->Extensions.EXT_texture_snorm &&
-                              ctx->Extensions.NV_primitive_restart &&
-                              ctx->Extensions.NV_texture_rectangle &&
-                              ctx->Const.VertexProgram.MaxTextureImageUnits >= 16);
-   const GLboolean ver_3_2 = (ver_3_1 &&
-                              ctx->Const.GLSLVersion >= 150 &&
-                              ctx->Extensions.ARB_depth_clamp &&
-                              ctx->Extensions.ARB_draw_elements_base_vertex &&
-                              ctx->Extensions.ARB_fragment_coord_conventions &&
-                              ctx->Extensions.ARB_geometry_shader4 &&
-                              ctx->Extensions.EXT_provoking_vertex &&
-                              ctx->Extensions.ARB_seamless_cube_map &&
-                              ctx->Extensions.ARB_sync &&
-                              ctx->Extensions.ARB_texture_multisample &&
-                              ctx->Extensions.EXT_vertex_array_bgra);
-   const GLboolean ver_3_3 = (ver_3_2 &&
-                              ctx->Const.GLSLVersion >= 330 &&
-                              ctx->Extensions.ARB_blend_func_extended &&
-                              ctx->Extensions.ARB_explicit_attrib_location &&
-                              ctx->Extensions.ARB_instanced_arrays &&
-                              ctx->Extensions.ARB_occlusion_query2 &&
-                              ctx->Extensions.ARB_shader_bit_encoding &&
-                              ctx->Extensions.ARB_texture_rgb10_a2ui &&
-                              ctx->Extensions.ARB_timer_query &&
-                              ctx->Extensions.ARB_vertex_type_2_10_10_10_rev &&
-                              ctx->Extensions.EXT_texture_swizzle);
-                              /* ARB_sampler_objects is always enabled in mesa */
-
-   if (ver_3_3) {
+   GLuint major, minor, version;
+
+   const bool ver_1_3 = (extensions->ARB_texture_border_clamp &&
+                         extensions->ARB_texture_cube_map &&
+                         extensions->ARB_texture_env_combine &&
+                         extensions->ARB_texture_env_dot3);
+   const bool ver_1_4 = (ver_1_3 &&
+                         extensions->ARB_depth_texture &&
+                         extensions->ARB_shadow &&
+                         extensions->ARB_texture_env_crossbar &&
+                         extensions->EXT_blend_color &&
+                         extensions->EXT_blend_func_separate &&
+                         extensions->EXT_blend_minmax &&
+                         extensions->EXT_point_parameters);
+   const bool ver_1_5 = (ver_1_4 &&
+                         extensions->ARB_occlusion_query);
+   const bool ver_2_0 = (ver_1_5 &&
+                         extensions->ARB_point_sprite &&
+                         extensions->ARB_vertex_shader &&
+                         extensions->ARB_fragment_shader &&
+                         extensions->ARB_texture_non_power_of_two &&
+                         extensions->EXT_blend_equation_separate &&
+
+                         /* Technically, 2.0 requires the functionality of the
+                          * EXT version.  Enable 2.0 if either extension is
+                          * available, and assume that a driver that only
+                          * exposes the ATI extension will fallback to
+                          * software when necessary.
+                          */
+                         (extensions->EXT_stencil_two_side
+                          || extensions->ATI_separate_stencil));
+   const bool ver_2_1 = (ver_2_0 &&
+                         extensions->EXT_pixel_buffer_object &&
+                         extensions->EXT_texture_sRGB);
+   const bool ver_3_0 = (ver_2_1 &&
+                         consts->GLSLVersion >= 130 &&
+                         (consts->MaxSamples >= 4 || consts->FakeSWMSAA) &&
+                         (api == API_OPENGL_CORE ||
+                          extensions->ARB_color_buffer_float) &&
+                         extensions->ARB_depth_buffer_float &&
+                         extensions->ARB_half_float_vertex &&
+                         extensions->ARB_map_buffer_range &&
+                         extensions->ARB_shader_texture_lod &&
+                         extensions->ARB_texture_float &&
+                         extensions->ARB_texture_rg &&
+                         extensions->ARB_texture_compression_rgtc &&
+                         extensions->EXT_draw_buffers2 &&
+                         extensions->ARB_framebuffer_object &&
+                         extensions->EXT_framebuffer_sRGB &&
+                         extensions->EXT_packed_float &&
+                         extensions->EXT_texture_array &&
+                         extensions->EXT_texture_shared_exponent &&
+                         extensions->EXT_transform_feedback &&
+                         extensions->NV_conditional_render);
+   const bool ver_3_1 = (ver_3_0 &&
+                         consts->GLSLVersion >= 140 &&
+                         extensions->ARB_draw_instanced &&
+                         extensions->ARB_texture_buffer_object &&
+                         extensions->ARB_uniform_buffer_object &&
+                         extensions->EXT_texture_snorm &&
+                         extensions->NV_primitive_restart &&
+                         extensions->NV_texture_rectangle &&
+                         consts->Program[MESA_SHADER_VERTEX].MaxTextureImageUnits >= 16);
+   const bool ver_3_2 = (ver_3_1 &&
+                         consts->GLSLVersion >= 150 &&
+                         extensions->ARB_depth_clamp &&
+                         extensions->ARB_draw_elements_base_vertex &&
+                         extensions->ARB_fragment_coord_conventions &&
+                         extensions->EXT_provoking_vertex &&
+                         extensions->ARB_seamless_cube_map &&
+                         extensions->ARB_sync &&
+                         extensions->ARB_texture_multisample &&
+                         extensions->EXT_vertex_array_bgra);
+   const bool ver_3_3 = (ver_3_2 &&
+                         consts->GLSLVersion >= 330 &&
+                         extensions->ARB_blend_func_extended &&
+                         extensions->ARB_explicit_attrib_location &&
+                         extensions->ARB_instanced_arrays &&
+                         extensions->ARB_occlusion_query2 &&
+                         extensions->ARB_shader_bit_encoding &&
+                         extensions->ARB_texture_rgb10_a2ui &&
+                         extensions->ARB_timer_query &&
+                         extensions->ARB_vertex_type_2_10_10_10_rev &&
+                         extensions->EXT_texture_swizzle);
+   /* ARB_sampler_objects is always enabled in mesa */
+
+   const bool ver_4_0 = (ver_3_3 &&
+                         consts->GLSLVersion >= 400 &&
+                         extensions->ARB_draw_buffers_blend &&
+                         extensions->ARB_draw_indirect &&
+                         extensions->ARB_gpu_shader5 &&
+                         extensions->ARB_gpu_shader_fp64 &&
+                         extensions->ARB_sample_shading &&
+                         false /*extensions->ARB_shader_subroutine*/ &&
+                         extensions->ARB_tessellation_shader &&
+                         extensions->ARB_texture_buffer_object_rgb32 &&
+                         extensions->ARB_texture_cube_map_array &&
+                         extensions->ARB_texture_query_lod &&
+                         extensions->ARB_transform_feedback2 &&
+                         extensions->ARB_transform_feedback3);
+   const bool ver_4_1 = (ver_4_0 &&
+                         consts->GLSLVersion >= 410 &&
+                         extensions->ARB_ES2_compatibility &&
+                         extensions->ARB_shader_precision &&
+                         extensions->ARB_vertex_attrib_64bit &&
+                         extensions->ARB_viewport_array);
+   const bool ver_4_2 = (ver_4_1 &&
+                         consts->GLSLVersion >= 420 &&
+                         extensions->ARB_base_instance &&
+                         extensions->ARB_conservative_depth &&
+                         extensions->ARB_internalformat_query &&
+                         extensions->ARB_shader_atomic_counters &&
+                         extensions->ARB_shader_image_load_store &&
+                         extensions->ARB_shading_language_420pack &&
+                         extensions->ARB_shading_language_packing &&
+                         extensions->ARB_texture_compression_bptc &&
+                         extensions->ARB_transform_feedback_instanced);
+
+   if (ver_4_2) {
+      major = 4;
+      minor = 2;
+   }
+   else if (ver_4_1) {
+      major = 4;
+      minor = 1;
+   }
+   else if (ver_4_0) {
+      major = 4;
+      minor = 0;
+   }
+   else if (ver_3_3) {
       major = 3;
       minor = 3;
    }
@@ -324,75 +387,110 @@ compute_version(struct gl_context *ctx)
       minor = 2;
    }
 
-   ctx->Version = major * 10 + minor;
+   version = major * 10 + minor;
+
+   if (api == API_OPENGL_CORE && version < 31)
+      return 0;
 
-   create_version_string(ctx, "");
+   return version;
 }
 
-static void
-compute_version_es1(struct gl_context *ctx)
+static GLuint
+compute_version_es1(const struct gl_extensions *extensions)
 {
    /* OpenGL ES 1.0 is derived from OpenGL 1.3 */
-   const GLboolean ver_1_0 = (ctx->Extensions.ARB_texture_env_combine &&
-                              ctx->Extensions.ARB_texture_env_dot3);
+   const bool ver_1_0 = (extensions->ARB_texture_env_combine &&
+                         extensions->ARB_texture_env_dot3);
    /* OpenGL ES 1.1 is derived from OpenGL 1.5 */
-   const GLboolean ver_1_1 = (ver_1_0 &&
-                              ctx->Extensions.EXT_point_parameters);
+   const bool ver_1_1 = (ver_1_0 &&
+                         extensions->EXT_point_parameters);
 
    if (ver_1_1) {
-      ctx->Version = 11;
+      return 11;
    } else if (ver_1_0) {
-      ctx->Version = 10;
+      return 10;
    } else {
-      _mesa_problem(ctx, "Incomplete OpenGL ES 1.0 support.");
+      return 0;
    }
-
-   create_version_string(ctx, "OpenGL ES-CM ");
 }
 
-static void
-compute_version_es2(struct gl_context *ctx)
+static GLuint
+compute_version_es2(const struct gl_extensions *extensions)
 {
    /* OpenGL ES 2.0 is derived from OpenGL 2.0 */
-   const GLboolean ver_2_0 = (ctx->Extensions.ARB_texture_cube_map &&
-                              ctx->Extensions.EXT_blend_color &&
-                              ctx->Extensions.EXT_blend_func_separate &&
-                              ctx->Extensions.EXT_blend_minmax &&
-                              ctx->Extensions.ARB_shader_objects &&
-                              ctx->Extensions.ARB_vertex_shader &&
-                              ctx->Extensions.ARB_fragment_shader &&
-                              ctx->Extensions.ARB_texture_non_power_of_two &&
-                              ctx->Extensions.EXT_blend_equation_separate);
+   const bool ver_2_0 = (extensions->ARB_texture_cube_map &&
+                         extensions->EXT_blend_color &&
+                         extensions->EXT_blend_func_separate &&
+                         extensions->EXT_blend_minmax &&
+                         extensions->ARB_vertex_shader &&
+                         extensions->ARB_fragment_shader &&
+                         extensions->ARB_texture_non_power_of_two &&
+                         extensions->EXT_blend_equation_separate);
    /* FINISHME: This list isn't quite right. */
-   const GLboolean ver_3_0 = (ctx->Extensions.ARB_half_float_vertex &&
-                              ctx->Extensions.ARB_internalformat_query &&
-                              ctx->Extensions.ARB_map_buffer_range &&
-                              ctx->Extensions.ARB_shader_texture_lod &&
-                              ctx->Extensions.ARB_texture_float &&
-                              ctx->Extensions.ARB_texture_rg &&
-                              ctx->Extensions.ARB_texture_compression_rgtc &&
-                              ctx->Extensions.EXT_draw_buffers2 &&
-                              /* ctx->Extensions.ARB_framebuffer_object && */
-                              ctx->Extensions.EXT_framebuffer_sRGB &&
-                              ctx->Extensions.EXT_packed_float &&
-                              ctx->Extensions.EXT_texture_array &&
-                              ctx->Extensions.EXT_texture_shared_exponent &&
-                              ctx->Extensions.EXT_transform_feedback &&
-                              ctx->Extensions.NV_conditional_render &&
-                              ctx->Extensions.ARB_draw_instanced &&
-                              ctx->Extensions.ARB_uniform_buffer_object &&
-                              ctx->Extensions.EXT_texture_snorm &&
-                              ctx->Extensions.NV_primitive_restart &&
-                              ctx->Extensions.OES_depth_texture_cube_map);
-   if (ver_3_0) {
-      ctx->Version = 30;
+   const bool ver_3_0 = (extensions->ARB_half_float_vertex &&
+                         extensions->ARB_internalformat_query &&
+                         extensions->ARB_map_buffer_range &&
+                         extensions->ARB_shader_texture_lod &&
+                         extensions->ARB_texture_float &&
+                         extensions->ARB_texture_rg &&
+                         extensions->ARB_depth_buffer_float &&
+                         extensions->EXT_draw_buffers2 &&
+                         /* extensions->ARB_framebuffer_object && */
+                         extensions->EXT_framebuffer_sRGB &&
+                         extensions->EXT_packed_float &&
+                         extensions->EXT_texture_array &&
+                         extensions->EXT_texture_shared_exponent &&
+                         extensions->EXT_transform_feedback &&
+                         extensions->ARB_draw_instanced &&
+                         extensions->ARB_uniform_buffer_object &&
+                         extensions->EXT_texture_snorm &&
+                         extensions->NV_primitive_restart &&
+                         extensions->OES_depth_texture_cube_map);
+   const bool ver_3_1 = (ver_3_0 &&
+                         extensions->ARB_arrays_of_arrays &&
+                         extensions->ARB_compute_shader &&
+                         extensions->ARB_draw_indirect &&
+                         false /*extensions->ARB_framebuffer_no_attachments*/ &&
+                         extensions->ARB_shader_atomic_counters &&
+                         extensions->ARB_shader_image_load_store &&
+                         false /*extensions->ARB_shader_image_size*/ &&
+                         false /*extensions->ARB_shader_storage_buffer_object*/ &&
+                         extensions->ARB_shading_language_packing &&
+                         extensions->ARB_stencil_texturing &&
+                         extensions->ARB_gpu_shader5 &&
+                         extensions->EXT_shader_integer_mix);
+
+   if (ver_3_1) {
+      return 31;
+   } else if (ver_3_0) {
+      return 30;
    } else if (ver_2_0) {
-      ctx->Version = 20;
+      return 20;
    } else {
-      _mesa_problem(ctx, "Incomplete OpenGL ES 2.0 support.");
+      return 0;
    }
+}
 
-   create_version_string(ctx, "OpenGL ES ");
+GLuint
+_mesa_get_version(const struct gl_extensions *extensions,
+                  struct gl_constants *consts, gl_api api)
+{
+   switch (api) {
+   case API_OPENGL_COMPAT:
+      /* Disable GLSL 1.40 and later for legacy contexts.
+       * This disallows creation of the GL 3.1 compatibility context. */
+      if (consts->GLSLVersion > 130) {
+         consts->GLSLVersion = 130;
+      }
+      /* fall through */
+   case API_OPENGL_CORE:
+      return compute_version(extensions, consts, api);
+   case API_OPENGLES:
+      return compute_version_es1(extensions);
+   case API_OPENGLES2:
+      return compute_version_es2(extensions);
+   }
+   return 0;
 }
 
 /**
@@ -406,23 +504,45 @@ _mesa_compute_version(struct gl_context *ctx)
    if (ctx->Version)
       return;
 
+   ctx->Version = _mesa_get_version(&ctx->Extensions, &ctx->Const, ctx->API);
+
+   /* Make sure that the GLSL version lines up with the GL version. In some
+    * cases it can be too high, e.g. if an extension is missing.
+    */
+   if (ctx->API == API_OPENGL_CORE) {
+      switch (ctx->Version) {
+      case 31:
+         ctx->Const.GLSLVersion = 140;
+         break;
+      case 32:
+         ctx->Const.GLSLVersion = 150;
+         break;
+      default:
+         ctx->Const.GLSLVersion = ctx->Version * 10;
+         break;
+      }
+   }
+
    switch (ctx->API) {
    case API_OPENGL_COMPAT:
-      /* Disable GLSL 1.40 and later for legacy contexts.
-       * This disallows creation of the GL 3.1 compatibility context. */
-      if (ctx->Const.GLSLVersion > 130) {
-         ctx->Const.GLSLVersion = 130;
-      }
-      /* fall through */
    case API_OPENGL_CORE:
-      compute_version(ctx);
+      create_version_string(ctx, "");
       break;
+
    case API_OPENGLES:
-      compute_version_es1(ctx);
+      if (!ctx->Version) {
+         _mesa_problem(ctx, "Incomplete OpenGL ES 1.0 support.");
+         return;
+      }
+      create_version_string(ctx, "OpenGL ES-CM ");
       break;
+
    case API_OPENGLES2:
-      compute_version_es2(ctx);
+      if (!ctx->Version) {
+         _mesa_problem(ctx, "Incomplete OpenGL ES 2.0 support.");
+         return;
+      }
+      create_version_string(ctx, "OpenGL ES ");
       break;
    }
-
 }