[Mesa-dev] [PATCH] i965/gen6: Enable GL 3.3 and GLSL 3.30

[Jordan Justen]

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

Mike, my reply for your patch was going to be:
* Can you inline your patch?
* Did you run piglit?

On Fri, Sep 19, 2014 at 3:39 PM, Chris Forbes <chrisf at ijw.co.nz> wrote:
> Tested on my snb-gt2:
>
> 4 tests skip->pass in spec/EXT_texture_array
> 51 tests skip->pass in spec.glsl-3.30
> 4 tests skip->pass in spec/!OpenGL 3.3
> No regressions; no skip->fail changes.
>
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
> ---
>
> Had the gen6 machine out anyway to try some other things; may as well get this test run done at the same time :)
>
>  src/mesa/drivers/dri/i965/intel_extensions.c | 4 +---
>  src/mesa/drivers/dri/i965/intel_screen.c     | 7 +------
>  2 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
> index b7c64c6..4e6627e 100644
> --- a/src/mesa/drivers/dri/i965/intel_extensions.c
> +++ b/src/mesa/drivers/dri/i965/intel_extensions.c
> @@ -243,10 +243,8 @@ intelInitExtensions(struct gl_context *ctx)
>     ctx->Extensions.OES_standard_derivatives = true;
>     ctx->Extensions.OES_EGL_image_external = true;
>
> -   if (brw->gen >= 7)
> +   if (brw->gen >= 6)
>        ctx->Const.GLSLVersion = 330;
> -   else if (brw->gen >= 6)
> -      ctx->Const.GLSLVersion = 150;
>     else
>        ctx->Const.GLSLVersion = 120;
>     _mesa_override_glsl_version(&ctx->Const);
> diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
> index 8070e97..41964ec 100644
> --- a/src/mesa/drivers/dri/i965/intel_screen.c
> +++ b/src/mesa/drivers/dri/i965/intel_screen.c
> @@ -1269,13 +1269,8 @@ set_max_gl_versions(struct intel_screen *screen)
>     switch (screen->devinfo->gen) {
>     case 8:
>     case 7:
> -      psp->max_gl_core_version = 33;
> -      psp->max_gl_compat_version = 30;
> -      psp->max_gl_es1_version = 11;
> -      psp->max_gl_es2_version = 30;
> -      break;
>     case 6:
> -      psp->max_gl_core_version = 32;
> +      psp->max_gl_core_version = 33;
>        psp->max_gl_compat_version = 30;
>        psp->max_gl_es1_version = 11;
>        psp->max_gl_es2_version = 30;
> --
> 1.8.5.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev