i965/gen7: expose OpenGL 4.2 on Haswell when supported

GL_ARB_vertex_attrib_64bit was the last piece missing.

v2: update docs (Jordan)

Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/docs/features.txt b/docs/features.txt
index efa780fea17a502887d4798b81ff41b263b64b31..dd40ac43d0b14d053ede1c0e352d0cf2b32e5f99 100644 (file)
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -136,7 +136,7 @@ GL 4.0, GLSL 4.00 --- all DONE: i965/hsw+, nvc0, r600, radeonsi
   GL_ARB_transform_feedback3                            DONE (i965/gen7+, llvmpipe, softpipe, swr)
 
 
-GL 4.1, GLSL 4.10 --- all DONE: i965/gen8+, nvc0, r600, radeonsi
+GL 4.1, GLSL 4.10 --- all DONE: i965/hsw+, nvc0, r600, radeonsi
 
   GL_ARB_ES2_compatibility                              DONE (i965, nv50, llvmpipe, softpipe, swr)
   GL_ARB_get_program_binary                             DONE (0 binary formats)
@@ -146,7 +146,7 @@ GL 4.1, GLSL 4.10 --- all DONE: i965/gen8+, nvc0, r600, radeonsi
   GL_ARB_viewport_array                                 DONE (i965, nv50, llvmpipe, softpipe)
 
 
-GL 4.2, GLSL 4.20 -- all DONE: i965/gen8+, nvc0, radeonsi
+GL 4.2, GLSL 4.20 -- all DONE: i965/hsw+, nvc0, radeonsi
 
   GL_ARB_texture_compression_bptc                       DONE (i965, r600)
   GL_ARB_compressed_texture_pixel_storage               DONE (all drivers)

diff --git a/docs/relnotes/17.0.0.html b/docs/relnotes/17.0.0.html
index bd397d27e068612f60d31557fdff8e6cc8113b0b..b50f9e95cb430315f3cc6476e65013cd71fb9329 100644 (file)
--- a/docs/relnotes/17.0.0.html
+++ b/docs/relnotes/17.0.0.html
@@ -50,7 +50,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_gpu_shader_fp64 in i965/haswell</li>
 <li>GL_ARB_vertex_attrib_64bit in i965/haswell</li>
 <li>GL_ARB_shader_precision in i965/haswell</li>
-<li>Intel Haswell now supports OpenGL 4.0</li>
+<li>Intel Haswell now supports OpenGL 4.2</li>
 <li>GL_OES_geometry_shader on i965/haswell</li>
 <li>GL_OES_texture_cube_map_array on i965/haswell</li>
 <li>GL_OES_viewport_array on i965/haswell</li>

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index dc46772fd7407a209ad887fe20896f3ead25b7cd..7a40ebaa4246b71e13a27bd53f4cc5d993b2dfc5 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -137,7 +137,7 @@ intelInitExtensions(struct gl_context *ctx)
    if (brw->gen >= 8)
       ctx->Const.GLSLVersion = 450;
    else if (brw->is_haswell && can_do_pipelined_register_writes(brw->screen))
-      ctx->Const.GLSLVersion = 400;
+      ctx->Const.GLSLVersion = 420;
    else if (brw->gen >= 6)
       ctx->Const.GLSLVersion = 330;
    else

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 5fcb5c6fd7fbcf9b97b919622058d251e52a802d..a8d401cdffa76081160cd59c9650577ec9146eac 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1539,7 +1539,7 @@ set_max_gl_versions(struct intel_screen *screen)
       break;
    case 7:
       dri_screen->max_gl_core_version = screen->devinfo.is_haswell &&
-         can_do_pipelined_register_writes(screen) ? 40 : 33;
+         can_do_pipelined_register_writes(screen) ? 42 : 33;
       dri_screen->max_gl_compat_version = 30;
       dri_screen->max_gl_es1_version = 11;
       dri_screen->max_gl_es2_version = screen->devinfo.is_haswell ? 31 : 30;