i965: Add support for GL_ARB_occlusion_query2.

This extension is just a bit of core code on top of the GL_ARB_occlusion_query
support.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/docs/GL3.txt b/docs/GL3.txt
index 246eb30a9df2a3dde96d4bfed80afdda3a17864a..c1e2da82b88bd79a2f46bd6662d875090fb382fc 100644 (file)
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -75,7 +75,7 @@ GL 3.3:
 GLSL 3.30                                             new features in this version pretty much done
 GL_ARB_blend_func_extended                            DONE (i965, r600, softpipe)
 GL_ARB_explicit_attrib_location                       DONE (i915, i965, r300, r600, swrast)
-GL_ARB_occlusion_query2                               DONE (r300, r600, swrast)
+GL_ARB_occlusion_query2                               DONE (i965, r300, r600, swrast)
 GL_ARB_sampler_objects                                DONE (i965, r300, r600)
 GL_ARB_shader_bit_encoding                            DONE
 GL_ARB_texture_rgb10_a2ui                             DONE (i965, r600)

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 9065f3855cea484803ce8584992766866fcb4ffe..df7abff3d9662df29c48c97435812762b2e33901 100755 (executable)
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -124,6 +124,7 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Extensions.ARB_fragment_shader = true;
       ctx->Extensions.ARB_half_float_vertex = true;
       ctx->Extensions.ARB_occlusion_query = true;
+      ctx->Extensions.ARB_occlusion_query2 = true;
       ctx->Extensions.ARB_point_sprite = true;
       ctx->Extensions.ARB_seamless_cube_map = true;
       ctx->Extensions.ARB_shader_bit_encoding = true;