AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: add KHR_no_error support for glDispatchCompute*()

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri
2017-05-15 12:28:08 +10:00
parent d1894c42ef
commit f96edf72b4
4 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mapi/glapi/gen/ARB_compute_shader.xml
+2 -2
View File
@@ -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>
src/mapi/glapi/gen/ARB_compute_variable_group_size.xml
+1 -1
View File
@@ -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"/>
src/mesa/main/compute.c
+26
View File
@@ -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,
src/mesa/main/compute.h
+12
View File
@@ -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,