i965: enable OES_primitive_bounding_box with the no-op implementation

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/docs/features.txt b/docs/features.txt
index 6959b0bdf93f0be05781fbd35ca1301c36941607..d6c3240cd32e3b0899dd1a5215f6023980ccd9d5 100644 (file)
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -262,7 +262,7 @@ GLES3.2, GLSL ES 3.2:
   GL_OES_draw_elements_base_vertex                      DONE (all drivers)
   GL_OES_geometry_shader                                DONE (i965/gen8+)
   GL_OES_gpu_shader5                                    DONE (all drivers that support GL_ARB_gpu_shader5)
-  GL_OES_primitive_bounding_box                         DONE (nvc0, radeonsi)
+  GL_OES_primitive_bounding_box                         DONE (i965/gen7+, nvc0, radeonsi)
   GL_OES_sample_shading                                 DONE (i965, nvc0, r600, radeonsi)
   GL_OES_sample_variables                               DONE (i965, nvc0, r600, radeonsi)
   GL_OES_shader_image_atomic                            DONE (all drivers that support GL_ARB_shader_image_load_store)

diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html
index 21747d370cce0fb7af64db1752d33ef4e836f230..bb20e4fc0d638dfbc7fa7bf117f846527024e98c 100644 (file)
--- a/docs/relnotes/12.1.0.html
+++ b/docs/relnotes/12.1.0.html
@@ -59,7 +59,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_KHR_texture_compression_astc_sliced_3d on i965</li>
 <li>GL_OES_copy_image on nv50, nvc0, r600, radeonsi, softpipe, llvmpipe</li>
 <li>GL_OES_geometry_shader on i965/gen8+</li>
-<li>GL_OES_primitive_bounding_box on nvc0, radeonsi</li>
+<li>GL_OES_primitive_bounding_box on i965/gen7+, nvc0, radeonsi</li>
 <li>GL_OES_texture_cube_map_array on i965/gen8+</li>
 </ul>
 

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 41c972c568acd122d2a98844234c8481c5f55e8d..fec6df8ae46c748610bbea89e03f9a5a90a40da5 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -772,6 +772,9 @@ brw_initialize_context_constants(struct brw_context *brw)
    ctx->Const.MaxFramebufferHeight = 16384;
    ctx->Const.MaxFramebufferLayers = ctx->Const.MaxArrayTextureLayers;
    ctx->Const.MaxFramebufferSamples = max_samples;
+
+   /* OES_primitive_bounding_box */
+   ctx->Const.NoPrimitiveBoundingBoxOutput = true;
 }
 
 static void

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 76b585d8a259720560fea141c11ad2db1094b870..0f28546cfff4678e65b9d075da353bff621919d6 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -354,6 +354,7 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Extensions.ARB_texture_view = true;
       ctx->Extensions.ARB_shader_storage_buffer_object = true;
       ctx->Extensions.EXT_shader_samples_identical = true;
+      ctx->Extensions.OES_primitive_bounding_box = true;
       ctx->Extensions.OES_texture_buffer = true;
 
       if (brw->can_do_pipelined_register_writes) {