diff options
author | Kristian Høgsberg <[email protected]> | 2010-04-21 16:14:18 -0400 |
---|---|---|
committer | Kristian Høgsberg <[email protected]> | 2010-04-22 12:42:22 -0400 |
commit | 29107d4e07144f41614f053aa1fc49ccf225fedf (patch) | |
tree | 55ba95ca7547b43a17d5576a8d1106760c347942 /src/mesa/es/main | |
parent | 218ceb3e1874a5a28f36a8df3ca0e881cdf213d5 (diff) |
mesa: Compute GL version according to API
Diffstat (limited to 'src/mesa/es/main')
-rw-r--r-- | src/mesa/es/main/specials_es1.c | 29 | ||||
-rw-r--r-- | src/mesa/es/main/specials_es2.c | 30 |
2 files changed, 0 insertions, 59 deletions
diff --git a/src/mesa/es/main/specials_es1.c b/src/mesa/es/main/specials_es1.c index 88f77177c80..37a5943490d 100644 --- a/src/mesa/es/main/specials_es1.c +++ b/src/mesa/es/main/specials_es1.c @@ -32,33 +32,6 @@ extern const GLubyte * GLAPIENTRY _es_GetString(GLenum name); -static const GLubyte * -compute_es_version(void) -{ - GET_CURRENT_CONTEXT(ctx); - static const char es_1_0[] = "OpenGL ES-CM 1.0"; - static const char es_1_1[] = "OpenGL ES-CM 1.1"; - /* 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 && - 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); - if (ver_1_1) - return (const GLubyte *) es_1_1; - - if (!ver_1_0) - _mesa_problem(ctx, "Incomplete OpenGL ES 1.0 support."); - return (const GLubyte *) es_1_0; -} - - static size_t append_extension(char **str, const char *ext) { @@ -187,8 +160,6 @@ const GLubyte * GLAPIENTRY _es_GetString(GLenum name) { switch (name) { - case GL_VERSION: - return compute_es_version(); case GL_EXTENSIONS: return compute_es_extensions(); default: diff --git a/src/mesa/es/main/specials_es2.c b/src/mesa/es/main/specials_es2.c index 75ceaff2c29..24fecb837fd 100644 --- a/src/mesa/es/main/specials_es2.c +++ b/src/mesa/es/main/specials_es2.c @@ -32,34 +32,6 @@ const GLubyte * GLAPIENTRY _es_GetString(GLenum name); -static const GLubyte * -compute_es_version(void) -{ - GET_CURRENT_CONTEXT(ctx); - static const char es_2_0[] = "OpenGL ES 2.0"; - /* 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 && - ctx->Extensions.ARB_texture_cube_map && - ctx->Extensions.ARB_texture_mirrored_repeat && - ctx->Extensions.EXT_blend_color && - ctx->Extensions.EXT_blend_func_separate && - 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 && - ctx->Extensions.ARB_texture_non_power_of_two && - ctx->Extensions.EXT_blend_equation_separate); - if (!ver_2_0) - _mesa_problem(ctx, "Incomplete OpenGL ES 2.0 support."); - return (const GLubyte *) es_2_0; -} - - static size_t append_extension(char **str, const char *ext) { @@ -157,8 +129,6 @@ const GLubyte * GLAPIENTRY _es_GetString(GLenum name) { switch (name) { - case GL_VERSION: - return compute_es_version(); case GL_SHADING_LANGUAGE_VERSION: return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16"; case GL_EXTENSIONS: |