From 36de38c3a606d933042019f086117643337f53cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Thu, 19 Jun 2014 08:18:25 +0000 Subject: [PATCH] [OPENGL32/MESA] - Report OpenGL version 1.1 svn path=/trunk/; revision=63617 --- reactos/dll/opengl/mesa/main/version.c | 77 ++++---------------------- 1 file changed, 12 insertions(+), 65 deletions(-) diff --git a/reactos/dll/opengl/mesa/main/version.c b/reactos/dll/opengl/mesa/main/version.c index 63fe5b79300..89c912cbd1b 100644 --- a/reactos/dll/opengl/mesa/main/version.c +++ b/reactos/dll/opengl/mesa/main/version.c @@ -56,75 +56,22 @@ override_version(struct gl_context *ctx, GLuint *major, GLuint *minor) static void compute_version(struct gl_context *ctx) { - GLuint major, minor; - static const int max = 100; + /* report openGL 1.1 */ + ctx->VersionMajor = 1; + ctx->VersionMinor = 1; - const GLboolean ver_1_3 = (ctx->Extensions.ARB_texture_cube_map && - ctx->Extensions.ARB_texture_env_combine && - ctx->Extensions.ARB_texture_env_dot3); - const GLboolean ver_1_4 = (ver_1_3 && - ctx->Extensions.ARB_texture_env_crossbar && - ctx->Extensions.ARB_window_pos && - ctx->Extensions.EXT_blend_color && - ctx->Extensions.EXT_blend_func_separate && - ctx->Extensions.EXT_blend_minmax && - ctx->Extensions.EXT_fog_coord && - ctx->Extensions.EXT_point_parameters && - ctx->Extensions.EXT_secondary_color); - const GLboolean ver_1_5 = (ver_1_4 && - ctx->Extensions.EXT_shadow_funcs); - const GLboolean ver_2_0 = (ver_1_5 && - ctx->Extensions.ARB_point_sprite && - ctx->Extensions.EXT_blend_equation_separate); - const GLboolean ver_2_1 = (ver_2_0); - const GLboolean ver_3_0 = (ver_2_1 && - ctx->Extensions.ARB_map_buffer_range); + override_version(ctx, &ctx->VersionMajor, &ctx->VersionMinor); - - if (ver_3_0) { - major = 3; - minor = 0; - } - else if (ver_2_1) { - major = 2; - minor = 1; - } - else if (ver_2_0) { - major = 2; - minor = 0; - } - else if (ver_1_5) { - major = 1; - minor = 5; - } - else if (ver_1_4) { - major = 1; - minor = 4; - } - else if (ver_1_3) { - major = 1; - minor = 3; - } - else { - major = 1; - minor = 2; - } - - ctx->VersionMajor = major; - ctx->VersionMinor = minor; - - override_version(ctx, &ctx->VersionMajor, &ctx->VersionMinor); - - ctx->VersionString = (char *) malloc(max); - if (ctx->VersionString) { - _mesa_snprintf(ctx->VersionString, max, - "%u.%u Mesa " MESA_VERSION_STRING + ctx->VersionString = (char *) malloc(20); + if (ctx->VersionString) { + _mesa_snprintf(ctx->VersionString, 20, + "%u.%u Mesa " MESA_VERSION_STRING #ifdef MESA_GIT_SHA1 - " (" MESA_GIT_SHA1 ")" + " (" MESA_GIT_SHA1 ")" #endif - , - ctx->VersionMajor, ctx->VersionMinor); - } + , + ctx->VersionMajor, ctx->VersionMinor); + } } /**