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

panfrost: Add a sysval for local_group_size 

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8358>
This commit is contained in:
Icecream95 2020-12-29 00:44:56 +13:00 committed by Marge Bot
parent 76fa57d195
commit f5a35918db
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/drivers/panfrost/pan_cmdstream.c
View File

@ -844,6 +844,17 @@ panfrost_upload_num_work_groups_sysval(struct panfrost_batch *batch,
uniform->u[2] = ctx->compute_grid->grid[2];
}
static void
panfrost_upload_local_group_size_sysval(struct panfrost_batch *batch,
struct sysval_uniform *uniform)
{
struct panfrost_context *ctx = batch->ctx;
uniform->u[0] = ctx->compute_grid->block[0];
uniform->u[1] = ctx->compute_grid->block[1];
uniform->u[2] = ctx->compute_grid->block[2];
}
static void
panfrost_upload_sysvals(struct panfrost_batch *batch, void *buf,
struct panfrost_shader_state *ss,
@ -877,6 +888,10 @@ panfrost_upload_sysvals(struct panfrost_batch *batch, void *buf,
panfrost_upload_num_work_groups_sysval(batch,
&uniforms[i]);
break;
case PAN_SYSVAL_LOCAL_GROUP_SIZE:
panfrost_upload_local_group_size_sysval(batch,
&uniforms[i]);
break;
case PAN_SYSVAL_SAMPLER:
panfrost_upload_sampler_sysval(batch, st,
PAN_SYSVAL_ID(sysval),

1
src/panfrost/bifrost/bifrost_compile.c
View File

@ -700,6 +700,7 @@ bi_emit_intrinsic(bi_builder *b, nir_intrinsic_instr *instr)
case nir_intrinsic_load_viewport_offset:
case nir_intrinsic_load_num_work_groups:
case nir_intrinsic_load_sampler_lod_parameters_pan:
case nir_intrinsic_load_local_group_size:
bi_load_sysval(b, &instr->instr, 3, 0);
break;
case nir_intrinsic_load_blend_const_color_r_float:

1
src/panfrost/midgard/midgard_compile.c
View File

@ -1809,6 +1809,7 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
case nir_intrinsic_load_viewport_offset:
case nir_intrinsic_load_num_work_groups:
case nir_intrinsic_load_sampler_lod_parameters_pan:
case nir_intrinsic_load_local_group_size:
emit_sysval_read(ctx, &instr->instr, 3, 0);
break;

1
src/panfrost/util/pan_ir.h
View File

@ -50,6 +50,7 @@ enum {
PAN_SYSVAL_SSBO = 4,
PAN_SYSVAL_NUM_WORK_GROUPS = 5,
PAN_SYSVAL_SAMPLER = 7,
PAN_SYSVAL_LOCAL_GROUP_SIZE = 8,
};
#define PAN_TXS_SYSVAL_ID(texidx, dim, is_array) \

2
src/panfrost/util/pan_sysval.c
View File

@ -58,6 +58,8 @@ panfrost_nir_sysval_for_intrinsic(nir_intrinsic_instr *instr)
return PAN_SYSVAL_VIEWPORT_OFFSET;
case nir_intrinsic_load_num_work_groups:
return PAN_SYSVAL_NUM_WORK_GROUPS;
case nir_intrinsic_load_local_group_size:
return PAN_SYSVAL_LOCAL_GROUP_SIZE;
case nir_intrinsic_load_ssbo_address:
case nir_intrinsic_get_ssbo_size:
return panfrost_sysval_for_ssbo(instr);