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

panfrost: s/panfrost_emit_shader/jm_emit_shader_env/

Browse source 
Prefix with jm_ so we know this is JM-specific, and emit_shader_env()
to make it clear this is the shader environment descriptor we
emit here.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26249>
This commit is contained in:
Boris Brezillon 2023-11-15 15:56:28 +01:00 • committed by Marge Bot
parent 50898556e0
commit fb2d2410bd
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -3128,9 +3128,9 @@ panfrost_emit_resources(struct panfrost_batch *batch,
}
static void
panfrost_emit_shader(struct panfrost_batch *batch,
struct MALI_SHADER_ENVIRONMENT *cfg,
enum pipe_shader_type stage, mali_ptr shader_ptr)
jm_emit_shader_env(struct panfrost_batch *batch,
struct MALI_SHADER_ENVIRONMENT *cfg,
enum pipe_shader_type stage, mali_ptr shader_ptr)
{
cfg->resources = panfrost_emit_resources(batch, stage);
cfg->thread_storage = batch->tls.gpu;
@ -3249,8 +3249,8 @@ jm_emit_tiler_draw(void *out, struct panfrost_batch *batch, bool fs_required,
cfg.overdraw_alpha0 = panfrost_overdraw_alpha(ctx, 0);
cfg.overdraw_alpha1 = panfrost_overdraw_alpha(ctx, 1);
panfrost_emit_shader(batch, &cfg.shader, PIPE_SHADER_FRAGMENT,
batch->rsd[PIPE_SHADER_FRAGMENT]);
jm_emit_shader_env(batch, &cfg.shader, PIPE_SHADER_FRAGMENT,
batch->rsd[PIPE_SHADER_FRAGMENT]);
} else {
/* These operations need to be FORCE to benefit from the
* depth-only pass optimizations.
@ -3388,8 +3388,8 @@ jm_emit_malloc_vertex_job(struct panfrost_batch *batch,
fs_required, u_reduced_prim(info->mode));
pan_section_pack(job, MALLOC_VERTEX_JOB, POSITION, cfg) {
panfrost_emit_shader(batch, &cfg, PIPE_SHADER_VERTEX,
panfrost_get_position_shader(batch, info));
jm_emit_shader_env(batch, &cfg, PIPE_SHADER_VERTEX,
panfrost_get_position_shader(batch, info));
}
pan_section_pack(job, MALLOC_VERTEX_JOB, VARYING, cfg) {
@ -3400,8 +3400,8 @@ jm_emit_malloc_vertex_job(struct panfrost_batch *batch,
if (!secondary_shader)
continue;
panfrost_emit_shader(batch, &cfg, PIPE_SHADER_VERTEX,
panfrost_get_varying_shader(batch));
jm_emit_shader_env(batch, &cfg, PIPE_SHADER_VERTEX,
panfrost_get_varying_shader(batch));
}
}
#endif
@ -3456,8 +3456,8 @@ jm_launch_xfb(struct panfrost_batch *batch, const struct pipe_draw_info *info,
cfg.workgroup_count_y = info->instance_count;
cfg.workgroup_count_z = 1;
panfrost_emit_shader(batch, &cfg.compute, PIPE_SHADER_VERTEX,
batch->rsd[PIPE_SHADER_VERTEX]);
jm_emit_shader_env(batch, &cfg.compute, PIPE_SHADER_VERTEX,
batch->rsd[PIPE_SHADER_VERTEX]);
/* TODO: Indexing. Also, this is a legacy feature... */
cfg.compute.attribute_offset = batch->ctx->offset_start;
@ -3896,8 +3896,8 @@ jm_launch_grid(struct panfrost_batch *batch, const struct pipe_grid_info *info)
cfg.workgroup_count_y = num_wg[1];
cfg.workgroup_count_z = num_wg[2];
panfrost_emit_shader(batch, &cfg.compute, PIPE_SHADER_COMPUTE,
batch->rsd[PIPE_SHADER_COMPUTE]);
jm_emit_shader_env(batch, &cfg.compute, PIPE_SHADER_COMPUTE,
batch->rsd[PIPE_SHADER_COMPUTE]);
/* Workgroups may be merged if the shader does not use barriers
* or shared memory. This condition is checked against the