summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-06-27 13:46:26 -0700
committerEric Anholt <[email protected]>2012-08-07 13:54:52 -0700
commit4a078516b6e9dd6876aaa2c95f0a98b7f5e08d19 (patch)
tree550b244e281971cf9587d9ac9dd843b179b81f9d
parent04871058eb01c5b51a0180055e7dbdc967f56604 (diff)
i965: Enable uniform buffer objects on gen6+.
Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--docs/GL3.txt2
-rwxr-xr-xsrc/mesa/drivers/dri/intel/intel_extensions.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt
index ecc5a21a7ee..d41c052c234 100644
--- 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 2d2245d534c..76b56a2a917 100755
--- 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)