diff options
| author | Paul Berry <[email protected]> | 2013-03-22 14:41:17 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-10-12 08:57:45 -0700 |
| commit | b6d6ea396c692b451b0195f07613e160b731d986 (patch) | |
| tree | 88a4bb805176981937dd0ba9ce5a9f5d3a038dda | |
| parent | d7d539a1cb8dcf50cb7cd534e6ae7df3f42914c8 (diff) | |
i965: Turn on GLSL 1.50 and GL 3.2 support for i965 gen7.
Geometry shaders were the last thing we needed to finish before
turning on GLSL 1.50 and GL 3.2 support. They are now working well,
with just a few piglit failures left to fix.
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Chris Forbes <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_extensions.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index 6f024b414aa..334be058f65 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -125,7 +125,9 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.OES_standard_derivatives = true; ctx->Extensions.OES_EGL_image_external = true; - if (brw->gen >= 6) + if (brw->gen >= 7) + ctx->Const.GLSLVersion = 150; + else if (brw->gen >= 6) ctx->Const.GLSLVersion = 140; else ctx->Const.GLSLVersion = 120; diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index b6b4275cc00..0d2c2edaa1d 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1198,7 +1198,7 @@ set_max_gl_versions(struct intel_screen *screen) switch (screen->gen) { case 7: - psp->max_gl_core_version = 31; + psp->max_gl_core_version = 32; psp->max_gl_compat_version = 30; psp->max_gl_es1_version = 11; psp->max_gl_es2_version = 30; |