vulkan/wsi: include builddir for generated headers

[mesa.git] / src / mesa / main / version.c

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index ffb7787ebe61759fa246bdf8614f0dbb01c99f0d..3d54d21a0428718d10176b24239fc6c9a66afd67 100644 (file)
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -111,7 +111,7 @@ exit:
 }
 
 /**
- * Builds the MESA version string.
+ * Builds the Mesa version string.
  */
 static void
 create_version_string(struct gl_context *ctx, const char *prefix)
@@ -382,7 +382,7 @@ compute_version(const struct gl_extensions *extensions,
                          extensions->ARB_ES3_1_compatibility &&
                          extensions->ARB_clip_control &&
                          extensions->ARB_conditional_render_inverted &&
-                         /* extensions->ARB_cull_distance */ 0 &&
+                         extensions->ARB_cull_distance &&
                          extensions->ARB_derivative_control &&
                          extensions->ARB_shader_texture_image_samples &&
                          extensions->NV_texture_barrier);
@@ -530,18 +530,19 @@ compute_version_es2(const struct gl_extensions *extensions,
                          extensions->ARB_gpu_shader5 &&
                          extensions->EXT_shader_integer_mix);
    const bool ver_3_2 = (ver_3_1 &&
-                         /*extensions->KHR_blend_equation_advanced*/ false &&
+                         extensions->KHR_blend_equation_advanced &&
+                         extensions->KHR_robustness &&
                          extensions->KHR_texture_compression_astc_ldr &&
                          extensions->OES_copy_image &&
                          extensions->ARB_draw_buffers_blend &&
                          extensions->ARB_draw_elements_base_vertex &&
                          extensions->OES_geometry_shader &&
-                         /*extensions->OES_primitive_bounding_box*/ false &&
+                         extensions->OES_primitive_bounding_box &&
                          extensions->OES_sample_variables &&
                          extensions->ARB_tessellation_shader &&
                          extensions->ARB_texture_border_clamp &&
                          extensions->OES_texture_buffer &&
-                         extensions->ARB_texture_cube_map_array &&
+                         extensions->OES_texture_cube_map_array &&
                          extensions->ARB_texture_stencil8);
 
    if (ver_3_2) {
@@ -565,8 +566,10 @@ _mesa_get_version(const struct gl_extensions *extensions,
    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;
+      if (!consts->AllowHigherCompatVersion) {
+         if (consts->GLSLVersion > 130) {
+            consts->GLSLVersion = 130;
+         }
       }
       /* fall through */
    case API_OPENGL_CORE: