Re: [Mesa-dev] [PATCH 1/2] mesa: add missing checks to compute_version
On 11/04/2011 05:42 PM, Marek Olšák wrote: > --- > src/mesa/main/version.c |5 + > 1 files changed, 5 insertions(+), 0 deletions(-) For this patch: Reviewed-by: Kenneth Graunke (sorry, haven't looked at the other one) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] mesa: add missing checks to compute_version
On Sat, 5 Nov 2011 01:42:40 +0100, Marek Olšák wrote: > --- > 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 && This patch is Reviewed-by: Eric Anholt pgpYDMDmq4tMH.pgp Description: PGP signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/2] mesa: add missing checks to compute_version
--- 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 && -- 1.7.4.1 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
