diff options
| author | Chris Forbes <chrisf@ijw.co.nz> | 2014-09-20 10:39:37 +1200 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2014-09-20 13:59:36 +1200 |
| commit | c4ed6c730f5fab03e19bf009d1ed85da3fd966db (patch) | |
| tree | c91e9f1d9dd1aa877759702d76ceb5b629ae0f73 /src/mesa/drivers/dri/i965/intel_extensions.c | |
| parent | 7ede5a1a7bd9571cbcfb63a89d1225a638c346f0 (diff) | |
| download | external_mesa3d-c4ed6c730f5fab03e19bf009d1ed85da3fd966db.zip external_mesa3d-c4ed6c730f5fab03e19bf009d1ed85da3fd966db.tar.gz external_mesa3d-c4ed6c730f5fab03e19bf009d1ed85da3fd966db.tar.bz2 | |
i965/gen6: Enable GL 3.3 and GLSL 3.30
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@ijw.co.nz>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_extensions.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_extensions.c | 4 |
1 files changed, 1 insertions, 3 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); |