From f96edf72b49348176b5eea0bdfe114e260dd3f99 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Mon, 15 May 2017 12:28:08 +1000
Subject: [PATCH] mesa: add KHR_no_error support for glDispatchCompute*()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---
 src/mapi/glapi/gen/ARB_compute_shader.xml     |  4 +--
 .../gen/ARB_compute_variable_group_size.xml   |  2 +-
 src/mesa/main/compute.c                       | 26 +++++++++++++++++++
 src/mesa/main/compute.h                       | 12 +++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_compute_shader.xml b/src/mapi/glapi/gen/ARB_compute_shader.xml
index c2ec842efe1..84cbdf39681 100644
--- a/src/mapi/glapi/gen/ARB_compute_shader.xml
+++ b/src/mapi/glapi/gen/ARB_compute_shader.xml
@@ -26,13 +26,13 @@
   <enum name="DISPATCH_INDIRECT_BUFFER_BINDING"                value="0x90EF"/>
   <enum name="COMPUTE_SHADER_BIT"                              value="0x00000020"/>
 
-  <function name="DispatchCompute" es2="3.1">
+  <function name="DispatchCompute" es2="3.1" no_error="true">
     <param name="num_groups_x" type="GLuint"/>
     <param name="num_groups_y" type="GLuint"/>
     <param name="num_groups_z" type="GLuint"/>
   </function>
 
-  <function name="DispatchComputeIndirect" es2="3.1">
+  <function name="DispatchComputeIndirect" es2="3.1" no_error="true">
     <param name="indirect" type="GLintptr"/>
   </function>
 </category>
diff --git a/src/mapi/glapi/gen/ARB_compute_variable_group_size.xml b/src/mapi/glapi/gen/ARB_compute_variable_group_size.xml
index b21c52fa120..a54c591a84a 100644
--- a/src/mapi/glapi/gen/ARB_compute_variable_group_size.xml
+++ b/src/mapi/glapi/gen/ARB_compute_variable_group_size.xml
@@ -12,7 +12,7 @@
   <enum name="MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB"        value="0x9345"/>
   <enum name="MAX_COMPUTE_FIXED_GROUP_SIZE_ARB"           value="0x91BF"/>
 
-  <function name="DispatchComputeGroupSizeARB">
+  <function name="DispatchComputeGroupSizeARB" no_error="true">
     <param name="num_groups_x" type="GLuint"/>
     <param name="num_groups_y" type="GLuint"/>
     <param name="num_groups_z" type="GLuint"/>
diff --git a/src/mesa/main/compute.c b/src/mesa/main/compute.c
index 16bb11f64d1..cbd166b1095 100644
--- a/src/mesa/main/compute.c
+++ b/src/mesa/main/compute.c
@@ -265,6 +265,13 @@ dispatch_compute(GLuint num_groups_x, GLuint num_groups_y,
    ctx->Driver.DispatchCompute(ctx, num_groups);
 }
 
+void GLAPIENTRY
+_mesa_DispatchCompute_no_error(GLuint num_groups_x, GLuint num_groups_y,
+                               GLuint num_groups_z)
+{
+   dispatch_compute(num_groups_x, num_groups_y, num_groups_z, true);
+}
+
 void GLAPIENTRY
 _mesa_DispatchCompute(GLuint num_groups_x,
                       GLuint num_groups_y,
@@ -289,6 +296,12 @@ dispatch_compute_indirect(GLintptr indirect, bool no_error)
    ctx->Driver.DispatchComputeIndirect(ctx, indirect);
 }
 
+extern void GLAPIENTRY
+_mesa_DispatchComputeIndirect_no_error(GLintptr indirect)
+{
+   dispatch_compute_indirect(indirect, true);
+}
+
 extern void GLAPIENTRY
 _mesa_DispatchComputeIndirect(GLintptr indirect)
 {
@@ -323,6 +336,19 @@ dispatch_compute_group_size(GLuint num_groups_x, GLuint num_groups_y,
    ctx->Driver.DispatchComputeGroupSize(ctx, num_groups, group_size);
 }
 
+void GLAPIENTRY
+_mesa_DispatchComputeGroupSizeARB_no_error(GLuint num_groups_x,
+                                           GLuint num_groups_y,
+                                           GLuint num_groups_z,
+                                           GLuint group_size_x,
+                                           GLuint group_size_y,
+                                           GLuint group_size_z)
+{
+   dispatch_compute_group_size(num_groups_x, num_groups_y, num_groups_z,
+                               group_size_x, group_size_y, group_size_z,
+                               true);
+}
+
 void GLAPIENTRY
 _mesa_DispatchComputeGroupSizeARB(GLuint num_groups_x, GLuint num_groups_y,
                                   GLuint num_groups_z, GLuint group_size_x,
diff --git a/src/mesa/main/compute.h b/src/mesa/main/compute.h
index 8018bbb2858..bfb3223d077 100644
--- a/src/mesa/main/compute.h
+++ b/src/mesa/main/compute.h
@@ -27,14 +27,26 @@
 
 #include "glheader.h"
 
+extern void GLAPIENTRY
+_mesa_DispatchCompute_no_error(GLuint num_groups_x, GLuint num_groups_y,
+                               GLuint num_groups_z);
 extern void GLAPIENTRY
 _mesa_DispatchCompute(GLuint num_groups_x,
                       GLuint num_groups_y,
                       GLuint num_groups_z);
 
+extern void GLAPIENTRY
+_mesa_DispatchComputeIndirect_no_error(GLintptr indirect);
 extern void GLAPIENTRY
 _mesa_DispatchComputeIndirect(GLintptr indirect);
 
+extern void GLAPIENTRY
+_mesa_DispatchComputeGroupSizeARB_no_error(GLuint num_groups_x,
+                                           GLuint num_groups_y,
+                                           GLuint num_groups_z,
+                                           GLuint group_size_x,
+                                           GLuint group_size_y,
+                                           GLuint group_size_z);
 extern void GLAPIENTRY
 _mesa_DispatchComputeGroupSizeARB(GLuint num_groups_x, GLuint num_groups_y,
                                   GLuint num_groups_z, GLuint group_size_x,
-- 
2.30.2