X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fversion.c;h=418d20e5cb2fd61cee6779c1629e23f8bf03ceb6;hb=8abf59ff98863634321e3e0d60035277e58e92e8;hp=5f004ff1dab8cc06644c51c1e8ea536932348c95;hpb=1013dfece1cffa38e9faf6a0fec7fd10711fcb58;p=mesa.git

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 5f004ff1dab..418d20e5cb2 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include "context.h"
-#include "imports.h"
+
 #include "mtypes.h"
 #include "version.h"
 #include "git_sha1.h"
@@ -120,7 +120,7 @@ create_version_string(struct gl_context *ctx, const char *prefix)
 
    ctx->VersionString = malloc(max);
    if (ctx->VersionString) {
-      _mesa_snprintf(ctx->VersionString, max,
+      snprintf(ctx->VersionString, max,
 		     "%s%u.%u%s Mesa " PACKAGE_VERSION MESA_GIT_SHA1,
 		     prefix,
 		     ctx->Version / 10, ctx->Version % 10,
@@ -330,6 +330,8 @@ compute_version(const struct gl_extensions *extensions,
                          extensions->ARB_transform_feedback3);
    const bool ver_4_1 = (ver_4_0 &&
                          consts->GLSLVersion >= 410 &&
+                         consts->MaxTextureSize >= 16384 &&
+                         consts->MaxRenderbufferSize >= 16384 &&
                          extensions->ARB_ES2_compatibility &&
                          extensions->ARB_shader_precision &&
                          extensions->ARB_vertex_attrib_64bit &&
@@ -384,8 +386,8 @@ compute_version(const struct gl_extensions *extensions,
                          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_gl_spirv &&
+                         extensions->ARB_spirv_extensions &&
                          extensions->ARB_indirect_parameters &&
                          extensions->ARB_pipeline_statistics_query &&
                          extensions->ARB_polygon_offset_clamp &&
@@ -524,7 +526,8 @@ compute_version_es2(const struct gl_extensions *extensions,
                          extensions->ARB_draw_instanced &&
                          extensions->ARB_uniform_buffer_object &&
                          extensions->EXT_texture_snorm &&
-                         extensions->NV_primitive_restart &&
+                         (extensions->NV_primitive_restart ||
+                          consts->PrimitiveRestartFixedIndex) &&
                          extensions->OES_depth_texture_cube_map &&
                          extensions->EXT_texture_type_2_10_10_10_REV);
    const bool es31_compute_shader =