summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2017-05-15 12:28:08 +1000
committerTimothy Arceri <tarceri@itsqueeze.com>2017-05-17 10:12:04 +1000
commitf96edf72b49348176b5eea0bdfe114e260dd3f99 (patch)
tree34c56bc0af9f26b58adcbb307493a0ed513fa761
parentd1894c42efb97fe5af09f235be5658558ee24346 (diff)
mesa: add KHR_no_error support for glDispatchCompute*()
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
-rw-r--r--src/mapi/glapi/gen/ARB_compute_shader.xml4
-rw-r--r--src/mapi/glapi/gen/ARB_compute_variable_group_size.xml2
-rw-r--r--src/mesa/main/compute.c26
-rw-r--r--src/mesa/main/compute.h12
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
@@ -266,6 +266,13 @@ dispatch_compute(GLuint num_groups_x, GLuint num_groups_y,
}
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,
GLuint num_groups_z)
@@ -290,6 +297,12 @@ dispatch_compute_indirect(GLintptr indirect, bool no_error)
}
extern void GLAPIENTRY
+_mesa_DispatchComputeIndirect_no_error(GLintptr indirect)
+{
+ dispatch_compute_indirect(indirect, true);
+}
+
+extern void GLAPIENTRY
_mesa_DispatchComputeIndirect(GLintptr indirect)
{
dispatch_compute_indirect(indirect, false);
@@ -324,6 +337,19 @@ dispatch_compute_group_size(GLuint num_groups_x, GLuint num_groups_y,
}
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,
GLuint group_size_y, GLuint group_size_z)
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
@@ -28,14 +28,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,
GLuint group_size_y, GLuint group_size_z);