From a43ac5e7c4d29fc9be86af730306e361683f5e08 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 19 Jul 2017 10:36:17 +0200
Subject: [PATCH] mesa: add KHR_no_error support to glMemoryBarrierByRegion()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---
 src/mapi/glapi/gen/GL4x.xml | 2 +-
 src/mesa/main/barrier.c     | 7 +++++++
 src/mesa/main/barrier.h     | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/GL4x.xml b/src/mapi/glapi/gen/GL4x.xml
index 7e8815beced..e958ee70c71 100644
--- a/src/mapi/glapi/gen/GL4x.xml
+++ b/src/mapi/glapi/gen/GL4x.xml
@@ -61,7 +61,7 @@
 </category>
 
 <category name="4.5">
-  <function name="MemoryBarrierByRegion" es2="3.1">
+  <function name="MemoryBarrierByRegion" es2="3.1" no_error="true">
     <param name="barriers" type="GLbitfield"/>
   </function>
 </category>
diff --git a/src/mesa/main/barrier.c b/src/mesa/main/barrier.c
index 0798d6efad2..5284f28dc02 100644
--- a/src/mesa/main/barrier.c
+++ b/src/mesa/main/barrier.c
@@ -108,6 +108,13 @@ memory_barrier_by_region(struct gl_context *ctx, GLbitfield barriers,
    }
 }
 
+void GLAPIENTRY
+_mesa_MemoryBarrierByRegion_no_error(GLbitfield barriers)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   memory_barrier_by_region(ctx, barriers, true);
+}
+
 void GLAPIENTRY
 _mesa_MemoryBarrierByRegion(GLbitfield barriers)
 {
diff --git a/src/mesa/main/barrier.h b/src/mesa/main/barrier.h
index d54c02af65b..53ecf863f07 100644
--- a/src/mesa/main/barrier.h
+++ b/src/mesa/main/barrier.h
@@ -44,6 +44,9 @@ _mesa_TextureBarrierNV(void);
 void GLAPIENTRY
 _mesa_MemoryBarrier(GLbitfield barriers);
 
+void GLAPIENTRY
+_mesa_MemoryBarrierByRegion_no_error(GLbitfield barriers);
+
 void GLAPIENTRY
 _mesa_MemoryBarrierByRegion(GLbitfield barriers);
 
-- 
2.30.2