mesa: use GLenum16 in a few more places

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

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 112a73dc0e7c6d334926a8424120f09ba0f9580e..1fce8fe7ca9cd54ee664629e90213792dd0ba446 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)
@@ -327,7 +327,6 @@ compute_version(const struct gl_extensions *extensions,
                          extensions->ARB_gpu_shader5 &&
                          extensions->ARB_gpu_shader_fp64 &&
                          extensions->ARB_sample_shading &&
-                         extensions->ARB_shader_subroutine &&
                          extensions->ARB_tessellation_shader &&
                          extensions->ARB_texture_buffer_object_rgb32 &&
                          extensions->ARB_texture_cube_map_array &&
@@ -351,8 +350,72 @@ compute_version(const struct gl_extensions *extensions,
                          extensions->ARB_shading_language_packing &&
                          extensions->ARB_texture_compression_bptc &&
                          extensions->ARB_transform_feedback_instanced);
-
-   if (ver_4_2) {
+   const bool ver_4_3 = (ver_4_2 &&
+                         consts->GLSLVersion >= 430 &&
+                         consts->Program[MESA_SHADER_VERTEX].MaxUniformBlocks >= 14 &&
+                         extensions->ARB_ES3_compatibility &&
+                         extensions->ARB_arrays_of_arrays &&
+                         extensions->ARB_compute_shader &&
+                         extensions->ARB_copy_image &&
+                         extensions->ARB_explicit_uniform_location &&
+                         extensions->ARB_fragment_layer_viewport &&
+                         extensions->ARB_framebuffer_no_attachments &&
+                         extensions->ARB_internalformat_query2 &&
+                         extensions->ARB_robust_buffer_access_behavior &&
+                         extensions->ARB_shader_image_size &&
+                         extensions->ARB_shader_storage_buffer_object &&
+                         extensions->ARB_stencil_texturing &&
+                         extensions->ARB_texture_buffer_range &&
+                         extensions->ARB_texture_query_levels &&
+                         extensions->ARB_texture_view);
+   const bool ver_4_4 = (ver_4_3 &&
+                         consts->GLSLVersion >= 440 &&
+                         extensions->ARB_buffer_storage &&
+                         extensions->ARB_clear_texture &&
+                         extensions->ARB_enhanced_layouts &&
+                         extensions->ARB_query_buffer_object &&
+                         extensions->ARB_texture_mirror_clamp_to_edge &&
+                         extensions->ARB_texture_stencil8 &&
+                         extensions->ARB_vertex_type_10f_11f_11f_rev);
+   const bool ver_4_5 = (ver_4_4 &&
+                         consts->GLSLVersion >= 450 &&
+                         extensions->ARB_ES3_1_compatibility &&
+                         extensions->ARB_clip_control &&
+                         extensions->ARB_conditional_render_inverted &&
+                         extensions->ARB_cull_distance &&
+                         extensions->ARB_derivative_control &&
+                         extensions->ARB_shader_texture_image_samples &&
+                         extensions->NV_texture_barrier);
+   const bool ver_4_6 = (ver_4_5 &&
+                         consts->GLSLVersion >= 460 &&
+                         /* extensions->ARB_gl_spirv */ 0 &&
+                         /* extensions->ARB_spirv_extensions */ 0 &&
+                         extensions->ARB_indirect_parameters &&
+                         extensions->ARB_pipeline_statistics_query &&
+                         extensions->ARB_polygon_offset_clamp &&
+                         extensions->ARB_shader_atomic_counter_ops &&
+                         extensions->ARB_shader_draw_parameters &&
+                         extensions->ARB_shader_group_vote &&
+                         extensions->ARB_texture_filter_anisotropic &&
+                         extensions->ARB_transform_feedback_overflow_query);
+
+   if (ver_4_6) {
+      major = 4;
+      minor = 6;
+   }
+   else if (ver_4_5) {
+      major = 4;
+      minor = 5;
+   }
+   else if (ver_4_4) {
+      major = 4;
+      minor = 4;
+   }
+   else if (ver_4_3) {
+      major = 4;
+      minor = 3;
+   }
+   else if (ver_4_2) {
       major = 4;
       minor = 2;
    }
@@ -453,7 +516,6 @@ compute_version_es2(const struct gl_extensions *extensions,
                          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 &&
@@ -482,8 +544,26 @@ compute_version_es2(const struct gl_extensions *extensions,
                          extensions->ARB_texture_multisample &&
                          extensions->ARB_gpu_shader5 &&
                          extensions->EXT_shader_integer_mix);
-
-   if (ver_3_1) {
+   const bool ver_3_2 = (ver_3_1 &&
+                         extensions->EXT_draw_buffers2 &&
+                         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 &&
+                         extensions->OES_sample_variables &&
+                         extensions->ARB_tessellation_shader &&
+                         extensions->ARB_texture_border_clamp &&
+                         extensions->OES_texture_buffer &&
+                         extensions->OES_texture_cube_map_array &&
+                         extensions->ARB_texture_stencil8);
+
+   if (ver_3_2) {
+      return 32;
+   } else if (ver_3_1) {
       return 31;
    } else if (ver_3_0) {
       return 30;
@@ -502,8 +582,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:
@@ -570,3 +652,16 @@ _mesa_compute_version(struct gl_context *ctx)
       break;
    }
 }
+
+
+void
+_mesa_get_driver_uuid(struct gl_context *ctx, GLint *uuid)
+{
+   ctx->Driver.GetDriverUuid(ctx, (char*) uuid);
+}
+
+void
+_mesa_get_device_uuid(struct gl_context *ctx, GLint *uuid)
+{
+   ctx->Driver.GetDeviceUuid(ctx, (char*) uuid);
+}