summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2016-05-23 22:41:23 -0400
committerIlia Mirkin <[email protected]>2016-05-23 23:47:11 -0400
commit5878254545f2b0207f47e581789e88fc0ab5c531 (patch)
treedadfcca92cc0c101ba93ec4b3b2e461d25d2a0b5 /src/mesa
parent72449c477ee3d3ecb825a49ea2fc2121a6c553e0 (diff)
mesa: remove separate enable for KHR_robust_buffer_access_behavior
This extension appears to be a strict subset of the ARB version. Also remove it from GL3.txt since it doesn't seem relevant. Signed-off-by: Ilia Mirkin <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/intel_extensions.c1
-rw-r--r--src/mesa/main/extensions_table.h2
-rw-r--r--src/mesa/main/mtypes.h1
3 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 6ed55036c3f..feea6cac5f2 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -372,7 +372,6 @@ intelInitExtensions(struct gl_context *ctx)
if (brw->gen >= 8 || brw->is_haswell || brw->is_baytrail) {
ctx->Extensions.ARB_robust_buffer_access_behavior = true;
- ctx->Extensions.KHR_robust_buffer_access_behavior = true;
}
if (brw->intelScreen->has_mi_math_and_lrr) {
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 0e78ee7b4c5..a809023dcfe 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -278,7 +278,7 @@ EXT(INTEL_performance_query , INTEL_performance_query
EXT(KHR_context_flush_control , dummy_true , GLL, GLC, x , ES2, 2014)
EXT(KHR_debug , dummy_true , GLL, GLC, 11, ES2, 2012)
-EXT(KHR_robust_buffer_access_behavior , KHR_robust_buffer_access_behavior , GLL, GLC, x , ES2, 2014)
+EXT(KHR_robust_buffer_access_behavior , ARB_robust_buffer_access_behavior , GLL, GLC, x , ES2, 2014)
EXT(KHR_texture_compression_astc_hdr , KHR_texture_compression_astc_hdr , GLL, GLC, x , ES2, 2012)
EXT(KHR_texture_compression_astc_ldr , KHR_texture_compression_astc_ldr , GLL, GLC, x , ES2, 2012)
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 29d7a4ffefd..b7b3ede57f1 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3901,7 +3901,6 @@ struct gl_extensions
GLboolean INTEL_performance_query;
GLboolean KHR_texture_compression_astc_hdr;
GLboolean KHR_texture_compression_astc_ldr;
- GLboolean KHR_robust_buffer_access_behavior;
GLboolean MESA_pack_invert;
GLboolean MESA_ycbcr_texture;
GLboolean NV_conditional_render;