summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-07-19 10:36:17 +0200
committerSamuel Pitoiset <[email protected]>2017-07-31 13:53:39 +0200
commita43ac5e7c4d29fc9be86af730306e361683f5e08 (patch)
tree8a140e8eb724f9b98a224b6bfc0791ed74cd4af2 /src
parent4de0033d73353f186eec8778074674da87090c5f (diff)
mesa: add KHR_no_error support to glMemoryBarrierByRegion()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/GL4x.xml2
-rw-r--r--src/mesa/main/barrier.c7
-rw-r--r--src/mesa/main/barrier.h3
3 files changed, 11 insertions, 1 deletions
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
@@ -109,6 +109,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)
{
GET_CURRENT_CONTEXT(ctx);
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
@@ -45,6 +45,9 @@ void GLAPIENTRY
_mesa_MemoryBarrier(GLbitfield barriers);
void GLAPIENTRY
+_mesa_MemoryBarrierByRegion_no_error(GLbitfield barriers);
+
+void GLAPIENTRY
_mesa_MemoryBarrierByRegion(GLbitfield barriers);
void GLAPIENTRY