I agree that we shouldn't be exposing EXT_texture_integer. I think it would be cleaner to just say that if GLSL 1.3 is supported, all the other features which are part of it are supported too. I would simplify the code like this (see below), and most of the checks for EXT_texture_integer should also check for the exposed GL version.
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 49cdc30..7826f82 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -127,6 +127,7 @@ compute_version(struct gl_context *ctx) ctx->Const.GLSLVersion >= 130 && ctx->Extensions.ARB_color_buffer_float && ctx->Extensions.ARB_depth_buffer_float && + ctx->Extensions.ARB_framebuffer_object && ctx->Extensions.ARB_half_float_pixel && ctx->Extensions.ARB_half_float_vertex && ctx->Extensions.ARB_map_buffer_range && @@ -135,14 +136,10 @@ compute_version(struct gl_context *ctx) ctx->Extensions.ARB_texture_compression_rgtc && ctx->Extensions.APPLE_vertex_array_object && ctx->Extensions.EXT_draw_buffers2 && - ctx->Extensions.EXT_framebuffer_blit && - ctx->Extensions.EXT_framebuffer_multisample && - ctx->Extensions.EXT_framebuffer_object && ctx->Extensions.EXT_framebuffer_sRGB && - ctx->Extensions.EXT_packed_depth_stencil && ctx->Extensions.EXT_packed_float && - ctx->Extensions.EXT_texture_array && - ctx->Extensions.EXT_texture_integer && + /* implied by GLSLVersion >= 130: */ + /*ctx->Extensions.EXT_texture_array &&*/ ctx->Extensions.EXT_texture_shared_exponent && ctx->Extensions.EXT_transform_feedback && ctx->Extensions.NV_conditional_render); Marek On Mon, Jan 2, 2012 at 5:38 PM, Dave Airlie <airl...@gmail.com> wrote: >> >> EXT_texture_integer isn't strictly equivalent to GL3, the L/I/A integer >> formats are not required in GL3, and some drivers may not require them. >> >> I've no idea if we have any hw that requires it, just sending the patch along >> after discussion on irc. > > Another reason was mentioned on irc, EXT_texture_integer claims to > require EXT_gpu_shader4 in its specification, so I'm not sure we > should be exposing it without EXT_gpu_shader4 even in the presence of > GL3. > > Dave. > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev