Module: Mesa Branch: master Commit: 97534d92e27d633be89447c0b22145bbce287789 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=97534d92e27d633be89447c0b22145bbce287789
Author: Marek Olšák <[email protected]> Date: Fri Nov 4 19:12:16 2011 +0100 mesa: add missing checks to compute_version Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> --- src/mesa/main/version.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 17c0600..49cdc30 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -124,9 +124,11 @@ compute_version(struct gl_context *ctx) ctx->Extensions.EXT_pixel_buffer_object && ctx->Extensions.EXT_texture_sRGB); const GLboolean ver_3_0 = (ver_2_1 && + ctx->Const.GLSLVersion >= 130 && ctx->Extensions.ARB_color_buffer_float && ctx->Extensions.ARB_depth_buffer_float && ctx->Extensions.ARB_half_float_pixel && + ctx->Extensions.ARB_half_float_vertex && ctx->Extensions.ARB_map_buffer_range && ctx->Extensions.ARB_texture_float && ctx->Extensions.ARB_texture_rg && @@ -145,6 +147,7 @@ compute_version(struct gl_context *ctx) ctx->Extensions.EXT_transform_feedback && ctx->Extensions.NV_conditional_render); const GLboolean ver_3_1 = (ver_3_0 && + ctx->Const.GLSLVersion >= 140 && ctx->Extensions.ARB_copy_buffer && ctx->Extensions.ARB_draw_instanced && ctx->Extensions.ARB_texture_buffer_object && @@ -154,6 +157,7 @@ compute_version(struct gl_context *ctx) ctx->Extensions.NV_texture_rectangle && ctx->Const.MaxVertexTextureImageUnits >= 16); const GLboolean ver_3_2 = (ver_3_1 && + ctx->Const.GLSLVersion >= 150 && ctx->Extensions.ARB_depth_clamp && ctx->Extensions.ARB_draw_elements_base_vertex && ctx->Extensions.ARB_fragment_coord_conventions && @@ -164,6 +168,7 @@ compute_version(struct gl_context *ctx) ctx->Extensions.ARB_texture_multisample && ctx->Extensions.EXT_vertex_array_bgra); const GLboolean ver_3_3 = (ver_3_2 && + ctx->Const.GLSLVersion >= 330 && ctx->Extensions.ARB_blend_func_extended && ctx->Extensions.ARB_explicit_attrib_location && ctx->Extensions.ARB_instanced_arrays && _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
