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

mesa: add missing display list support for ARB_compute_shader

Browse Source 
The extension is enabled for compat profile but there is currently
no display list support.

I filed a spec bug and it has been agreed that
glDispatchComputeIndirect should generate an INVALID_OPERATION
error when called during display list compilation.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri
2018-06-28 10:25:17 +10:00
parent 87d6093583
commit 03f1a2e8df
1 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/dlist.c
+39
View File
@@ -510,6 +510,9 @@ typedef enum
OPCODE_SAMPLER_PARAMETERIIV,
OPCODE_SAMPLER_PARAMETERUIV,
/* ARB_compute_shader */
OPCODE_DISPATCH_COMPUTE,
/* GL_ARB_sync */
OPCODE_WAIT_SYNC,
@@ -6570,6 +6573,33 @@ save_DrawTransformFeedbackStreamInstanced(GLenum mode, GLuint name,
}
}
static void GLAPIENTRY
save_DispatchCompute(GLuint num_groups_x, GLuint num_groups_y,
GLuint num_groups_z)
{
GET_CURRENT_CONTEXT(ctx);
Node *n;
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
n = alloc_instruction(ctx, OPCODE_DISPATCH_COMPUTE, 3);
if (n) {
n[1].ui = num_groups_x;
n[2].ui = num_groups_y;
n[3].ui = num_groups_z;
}
if (ctx->ExecuteFlag) {
CALL_DispatchCompute(ctx->Exec, (num_groups_x, num_groups_y,
num_groups_z));
}
}
static void GLAPIENTRY
save_DispatchComputeIndirect(GLintptr indirect)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_error(ctx, GL_INVALID_OPERATION,
"glDispatchComputeIndirect() during display list compile");
}
static void GLAPIENTRY
save_UseProgram(GLuint program)
{
@@ -10429,6 +10459,11 @@ execute_list(struct gl_context *ctx, GLuint list)
}
break;
/* ARB_compute_shader */
case OPCODE_DISPATCH_COMPUTE:
CALL_DispatchCompute(ctx->Exec, (n[1].ui, n[2].ui, n[3].ui));
break;
/* GL_ARB_sync */
case OPCODE_WAIT_SYNC:
{
@@ -11138,6 +11173,10 @@ _mesa_initialize_save_table(const struct gl_context *ctx)
SET_DepthRangeArrayv(table, save_DepthRangeArrayv);
SET_DepthRangeIndexed(table, save_DepthRangeIndexed);
/* 122. ARB_compute_shader */
SET_DispatchCompute(table, save_DispatchCompute);
SET_DispatchComputeIndirect(table, save_DispatchComputeIndirect);
/* 173. GL_EXT_blend_func_separate */
SET_BlendFuncSeparate(table, save_BlendFuncSeparateEXT);