summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/version.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main/version.c')
-rw-r--r--src/mesa/main/version.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 80fa0c244eb..384281479a3 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -39,10 +39,8 @@ compute_version(struct gl_context *ctx)
GLuint major, minor;
static const int max = 100;
- const GLboolean ver_1_3 = (ctx->Extensions.ARB_multisample &&
- ctx->Extensions.ARB_multitexture &&
+ const GLboolean ver_1_3 = (ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_texture_border_clamp &&
- ctx->Extensions.ARB_texture_compression &&
ctx->Extensions.ARB_texture_cube_map &&
ctx->Extensions.EXT_texture_env_add &&
ctx->Extensions.ARB_texture_env_combine &&
@@ -58,15 +56,12 @@ compute_version(struct gl_context *ctx)
ctx->Extensions.EXT_blend_minmax &&
ctx->Extensions.EXT_blend_subtract &&
ctx->Extensions.EXT_fog_coord &&
- ctx->Extensions.EXT_multi_draw_arrays &&
ctx->Extensions.EXT_point_parameters &&
ctx->Extensions.EXT_secondary_color &&
ctx->Extensions.EXT_stencil_wrap &&
- ctx->Extensions.EXT_texture_lod_bias &&
- ctx->Extensions.SGIS_generate_mipmap);
+ ctx->Extensions.EXT_texture_lod_bias);
const GLboolean ver_1_5 = (ver_1_4 &&
ctx->Extensions.ARB_occlusion_query &&
- ctx->Extensions.ARB_vertex_buffer_object &&
ctx->Extensions.EXT_shadow_funcs);
const GLboolean ver_2_0 = (ver_1_5 &&
ctx->Extensions.ARB_draw_buffers &&
@@ -201,17 +196,13 @@ compute_version_es1(struct gl_context *ctx)
static const int max = 100;
/* OpenGL ES 1.0 is derived from OpenGL 1.3 */
- const GLboolean ver_1_0 = (ctx->Extensions.ARB_multisample &&
- ctx->Extensions.ARB_multitexture &&
- ctx->Extensions.ARB_texture_compression &&
+ const GLboolean ver_1_0 = (ctx->Extensions.ARB_multitexture &&
ctx->Extensions.EXT_texture_env_add &&
ctx->Extensions.ARB_texture_env_combine &&
ctx->Extensions.ARB_texture_env_dot3);
/* OpenGL ES 1.1 is derived from OpenGL 1.5 */
const GLboolean ver_1_1 = (ver_1_0 &&
- ctx->Extensions.EXT_point_parameters &&
- ctx->Extensions.SGIS_generate_mipmap &&
- ctx->Extensions.ARB_vertex_buffer_object);
+ ctx->Extensions.EXT_point_parameters);
if (ver_1_1) {
ctx->VersionMajor = 1;
@@ -237,9 +228,7 @@ compute_version_es2(struct gl_context *ctx)
static const int max = 100;
/* OpenGL ES 2.0 is derived from OpenGL 2.0 */
- const GLboolean ver_2_0 = (ctx->Extensions.ARB_multisample &&
- ctx->Extensions.ARB_multitexture &&
- ctx->Extensions.ARB_texture_compression &&
+ const GLboolean ver_2_0 = (ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_texture_cube_map &&
ctx->Extensions.ARB_texture_mirrored_repeat &&
ctx->Extensions.EXT_blend_color &&
@@ -247,7 +236,6 @@ compute_version_es2(struct gl_context *ctx)
ctx->Extensions.EXT_blend_minmax &&
ctx->Extensions.EXT_blend_subtract &&
ctx->Extensions.EXT_stencil_wrap &&
- ctx->Extensions.ARB_vertex_buffer_object &&
ctx->Extensions.ARB_shader_objects &&
ctx->Extensions.ARB_vertex_shader &&
ctx->Extensions.ARB_fragment_shader &&