mesa: Rearrange legal_texobj_target to look more like _mesa_legal_get_tex_level_param...

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

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 2af3653f7bbef6c126618870f728cee390540985..cc4416dc1c9652cbd84a8c4488ccc203c80494d3 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)
@@ -361,7 +361,7 @@ compute_version(const struct gl_extensions *extensions,
                          extensions->ARB_fragment_layer_viewport &&
                          extensions->ARB_framebuffer_no_attachments &&
                          extensions->ARB_internalformat_query2 &&
-                         /* extensions->ARB_robust_buffer_access_behavior */ 0 &&
+                         extensions->ARB_robust_buffer_access_behavior &&
                          extensions->ARB_shader_image_size &&
                          extensions->ARB_shader_storage_buffer_object &&
                          extensions->ARB_stencil_texturing &&
@@ -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);
@@ -529,8 +529,24 @@ compute_version_es2(const struct gl_extensions *extensions,
                          extensions->ARB_texture_multisample &&
                          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_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_sample_variables &&
+                         extensions->ARB_tessellation_shader &&
+                         extensions->ARB_texture_border_clamp &&
+                         extensions->OES_texture_buffer &&
+                         extensions->ARB_texture_cube_map_array &&
+                         extensions->ARB_texture_stencil8);
 
-   if (ver_3_1) {
+   if (ver_3_2) {
+      return 32;
+   } else if (ver_3_1) {
       return 31;
    } else if (ver_3_0) {
       return 30;