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 <imirkin@alum.mit.edu>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/docs/GL3.txt b/docs/GL3.txt
index aa58e4acba96e3ba3d9df06de9a8963901bd98ff..4a9cf0b830c3e0e5209b76621df9c4b9d423a7a2 100644 (file)
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -218,7 +218,6 @@ GL 4.5, GLSL 4.50:
   GL_ARB_shader_texture_image_samples                   DONE (i965, nv50, nvc0, r600, radeonsi)
   GL_ARB_texture_barrier                                DONE (i965, 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                  DONE (i965)
   GL_KHR_robustness                                     not started (90% done with the ARB variant)
   GL_EXT_shader_integer_mix                             DONE (all drivers that support GLSL)
 

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 6ed55036c3fee90e185702a6780db00d59e1dfc8..feea6cac5f24e505daea6c9ed79d9f24d79c0458 100644 (file)
--- 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 0e78ee7b4c582edbf050ef0ea3ecb7e3fea4cbe4..a809023dcfe9690c570bbfb4bc257a74f14c55a5 100644 (file)
--- 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 29d7a4ffefde7c5f48defafa20aee4953385a52b..b7b3ede57f15ccf0250f6555895dcba7a081901c 100644 (file)
--- 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;