projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dri_util: Update internal_format to GL_RGB8 for MESA_FORMAT_B8G8R8X8_UNORM
[mesa.git]
/
src
/
mesa
/
main
/
version.c
diff --git
a/src/mesa/main/version.c
b/src/mesa/main/version.c
index 77ff51b6d9e66ef43a6ca346681e47bc86e29345..418d20e5cb2fd61cee6779c1629e23f8bf03ceb6 100644
(file)
--- a/
src/mesa/main/version.c
+++ b/
src/mesa/main/version.c
@@
-25,7
+25,7
@@
#include <stdio.h>
#include "context.h"
#include <stdio.h>
#include "context.h"
-#include "imports.h"
+
#include "mtypes.h"
#include "version.h"
#include "git_sha1.h"
#include "mtypes.h"
#include "version.h"
#include "git_sha1.h"
@@
-64,10
+64,10
@@
get_gl_override(gl_api api, int *version, bool *fwd_context,
bool fc_suffix;
bool compat_suffix;
} override[] = {
bool fc_suffix;
bool compat_suffix;
} override[] = {
- { -1, false, false},
- { -1, false, false},
- { -1, false, false},
- { -1, false, false},
+
[API_OPENGL_COMPAT] =
{ -1, false, false},
+
[API_OPENGLES] =
{ -1, false, false},
+
[API_OPENGLES2] =
{ -1, false, false},
+
[API_OPENGL_CORE] =
{ -1, false, false},
};
STATIC_ASSERT(ARRAY_SIZE(override) == API_OPENGL_LAST + 1);
};
STATIC_ASSERT(ARRAY_SIZE(override) == API_OPENGL_LAST + 1);
@@
-120,7
+120,7
@@
create_version_string(struct gl_context *ctx, const char *prefix)
ctx->VersionString = malloc(max);
if (ctx->VersionString) {
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,
"%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 &&
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 &&
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->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 &&
extensions->ARB_indirect_parameters &&
extensions->ARB_pipeline_statistics_query &&
extensions->ARB_polygon_offset_clamp &&
@@
-509,20
+511,25
@@
compute_version_es2(const struct gl_extensions *extensions,
extensions->ARB_internalformat_query &&
extensions->ARB_map_buffer_range &&
extensions->ARB_shader_texture_lod &&
extensions->ARB_internalformat_query &&
extensions->ARB_map_buffer_range &&
extensions->ARB_shader_texture_lod &&
- extensions->ARB_texture_float &&
+ extensions->OES_texture_float &&
+ extensions->OES_texture_half_float &&
+ extensions->OES_texture_half_float_linear &&
extensions->ARB_texture_rg &&
extensions->ARB_depth_buffer_float &&
extensions->ARB_texture_rg &&
extensions->ARB_depth_buffer_float &&
- /* extensions->ARB_framebuffer_object && */
- extensions->EXT_
framebuffer_
sRGB &&
+ extensions->ARB_framebuffer_object &&
+ extensions->EXT_sRGB &&
extensions->EXT_packed_float &&
extensions->EXT_texture_array &&
extensions->EXT_texture_shared_exponent &&
extensions->EXT_packed_float &&
extensions->EXT_texture_array &&
extensions->EXT_texture_shared_exponent &&
+ extensions->EXT_texture_sRGB &&
extensions->EXT_transform_feedback &&
extensions->ARB_draw_instanced &&
extensions->ARB_uniform_buffer_object &&
extensions->EXT_texture_snorm &&
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);
+ (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 =
consts->MaxComputeWorkGroupInvocations >= 128;
const bool ver_3_1 = (ver_3_0 &&
const bool es31_compute_shader =
consts->MaxComputeWorkGroupInvocations >= 128;
const bool ver_3_1 = (ver_3_0 &&