fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 20:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/compute: refactor compute launch to look more like draw

Browse source 
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14256>
This commit is contained in:
Dave Airlie 2021-12-15 11:46:36 +10:00
parent 56f5e69497
commit b6fd811d2c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/main/compute.c
View file

@ -285,11 +285,9 @@ valid_dispatch_indirect(struct gl_context *ctx, GLintptr indirect)
} }
static void static void
do_dispatch_compute(struct gl_context *ctx, prepare_compute(struct gl_context *ctx)
struct pipe_grid_info *info)
{ {
struct st_context *st = st_context(ctx); struct st_context *st = st_context(ctx);
struct pipe_context *pipe = st->pipe;
st_flush_bitmap_cache(st); st_flush_bitmap_cache(st);
st_invalidate_readpix_cache(st); st_invalidate_readpix_cache(st);
@ -302,7 +300,6 @@ do_dispatch_compute(struct gl_context *ctx,
st->compute_shader_may_be_dirty) st->compute_shader_may_be_dirty)
st_validate_state(st, ST_PIPELINE_COMPUTE); st_validate_state(st, ST_PIPELINE_COMPUTE);
pipe->launch_grid(pipe, info);
} }
static ALWAYS_INLINE void static ALWAYS_INLINE void
@ -334,7 +331,8 @@ dispatch_compute(GLuint num_groups_x, GLuint num_groups_y,
info.block[1] = prog->info.workgroup_size[1]; info.block[1] = prog->info.workgroup_size[1];
info.block[2] = prog->info.workgroup_size[2]; info.block[2] = prog->info.workgroup_size[2];
do_dispatch_compute(ctx, &info); prepare_compute(ctx);
ctx->pipe->launch_grid(ctx->pipe, &info);
if (MESA_DEBUG_FLAGS & DEBUG_ALWAYS_FLUSH) if (MESA_DEBUG_FLAGS & DEBUG_ALWAYS_FLUSH)
_mesa_flush(ctx); _mesa_flush(ctx);
@ -378,7 +376,8 @@ dispatch_compute_indirect(GLintptr indirect, bool no_error)
info.block[1] = prog->info.workgroup_size[1]; info.block[1] = prog->info.workgroup_size[1];
info.block[2] = prog->info.workgroup_size[2]; info.block[2] = prog->info.workgroup_size[2];
do_dispatch_compute(ctx, &info); prepare_compute(ctx);
ctx->pipe->launch_grid(ctx->pipe, &info);
if (MESA_DEBUG_FLAGS & DEBUG_ALWAYS_FLUSH) if (MESA_DEBUG_FLAGS & DEBUG_ALWAYS_FLUSH)
_mesa_flush(ctx); _mesa_flush(ctx);
@ -427,7 +426,8 @@ dispatch_compute_group_size(GLuint num_groups_x, GLuint num_groups_y,
if (num_groups_x == 0u || num_groups_y == 0u || num_groups_z == 0u) if (num_groups_x == 0u || num_groups_y == 0u || num_groups_z == 0u)
return; return;
do_dispatch_compute(ctx, &info); prepare_compute(ctx);
ctx->pipe->launch_grid(ctx->pipe, &info);
if (MESA_DEBUG_FLAGS & DEBUG_ALWAYS_FLUSH) if (MESA_DEBUG_FLAGS & DEBUG_ALWAYS_FLUSH)
_mesa_flush(ctx); _mesa_flush(ctx);