i965: Enable uniform buffer objects on gen6+.

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

diff --git a/docs/GL3.txt b/docs/GL3.txt
index ecc5a21a7eec3eda8c8002201ea3ce827d4c1433..d41c052c2342630ffd1ef0bf233f5832b0401d2d 100644 (file)
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -50,7 +50,7 @@ Primitive restart (GL_NV_primitive_restart)           DONE (i965, r600)
 16 vertex texture image units                         DONE
 Texture buffer objs (GL_ARB_texture_buffer_object)    needs GL3.1 enabling (i965)
 Rectangular textures (GL_ARB_texture_rectangle)       DONE (i965, r300, r600, swrast)
-Uniform buffer objs (GL_ARB_uniform_buffer_object)    not started
+Uniform buffer objs (GL_ARB_uniform_buffer_object)    DONE (i965)
 Signed normalized textures (GL_EXT_texture_snorm)     DONE (i965, r300, r600)
 
 

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 2d2245d534c881980960e32e160350d8d36c77b5..76b56a2a9172f2e7b00125442adf4c94ea295933 100755 (executable)
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -105,6 +105,7 @@ intelInitExtensions(struct gl_context *ctx)
    if (intel->gen >= 6) {
       ctx->Extensions.ARB_blend_func_extended = !driQueryOptionb(&intel->optionCache, "disable_blend_func_extended");
       ctx->Extensions.ARB_draw_buffers_blend = true;
+      ctx->Extensions.ARB_uniform_buffer_object = true;
    }
 
    if (intel->gen >= 5)