On 11/10/2011 09:38 AM, Paul Berry wrote:
On 9 November 2011 11:33, Eric Anholt <e...@anholt.net <mailto:e...@anholt.net>> wrote:With the gl_VertexID support, everything required should now be supported. --- src/mesa/drivers/dri/intel/intel_extensions.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 7a5ef3e..11a8135 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -90,7 +90,10 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.OES_EGL_image = true; #endif - ctx->Const.GLSLVersion = 120; + if (intel->gen >= 4) + ctx->Const.GLSLVersion = 130; + else + ctx->Const.GLSLVersion = 120; _mesa_override_glsl_version(ctx); if (intel->gen >= 5) -- 1.7.7 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org <mailto:mesa-dev@lists.freedesktop.org> http://lists.freedesktop.org/mailman/listinfo/mesa-dev I only think we can justify claiming GLSL 1.30 support for Gen6 and above right now. There are at least two significant GLSL 1.30 features that we haven't backported to Gen4 and Gen5: gl_ClipDistance and interpolation qualifiers. I'm not opposed to backporting those features in the long run, but there will be substantial work involved (especially for gl_ClipDistance, because Gen4 and Gen5 do clipping differently). So for now let's make it if (intel->gen >= 6).
I hate to say it, but I have to agree with Paul. :( Other than that, this whole series is
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
