summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2015-08-11 20:38:48 -0400
committerIlia Mirkin <[email protected]>2015-09-10 17:39:46 -0400
commitbfc5ace5bda6510d4dd3893a3b8c677a1c85e23e (patch)
tree2aa142f4f128580d777698102f18728a4d2922c1
parent55ebaa6d003b69c0a159a00d82a1e96f685062d6 (diff)
i965: enable ARB_shader_texture_image_samples
Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--docs/GL3.txt2
-rw-r--r--docs/relnotes/11.1.0.html2
-rw-r--r--src/mesa/drivers/dri/i965/intel_extensions.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt
index 8ad1aac50a5..25350021720 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -194,7 +194,7 @@ GL 4.5, GLSL 4.50:
GL_ARB_derivative_control DONE (i965, nv50, nvc0, r600, radeonsi)
GL_ARB_direct_state_access DONE (all drivers)
GL_ARB_get_texture_sub_image DONE (all drivers)
- GL_ARB_shader_texture_image_samples not started
+ GL_ARB_shader_texture_image_samples DONE (i965)
GL_ARB_texture_barrier DONE (nv50, nvc0, r600, radeonsi)
GL_KHR_context_flush_control DONE (all - but needs GLX/EGL extension to be useful)
GL_KHR_robust_buffer_access_behavior not started
diff --git a/docs/relnotes/11.1.0.html b/docs/relnotes/11.1.0.html
index 4b56f69660d..603b06f41c9 100644
--- a/docs/relnotes/11.1.0.html
+++ b/docs/relnotes/11.1.0.html
@@ -44,8 +44,8 @@ Note: some of the new features are only available with certain drivers.
</p>
<ul>
+<li>GL_ARB_shader_texture_image_samples on i965</li>
<li>GL_ARB_texture_query_lod on softpipe</li>
-TBD.
</ul>
<h2>Bug fixes</h2>
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 8842f50935a..e6d39e00788 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -325,6 +325,7 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_shader_atomic_counters = true;
ctx->Extensions.ARB_shader_image_load_store = true;
ctx->Extensions.ARB_shader_image_size = true;
+ ctx->Extensions.ARB_shader_texture_image_samples = true;
ctx->Extensions.ARB_texture_compression_bptc = true;
ctx->Extensions.ARB_texture_view = true;