diff options
| author | Icecream95 <ixn@disroot.org> | 2020-12-29 00:47:54 +1300 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-01-18 20:49:45 +0000 |
| commit | 24867386eef385a65d6452889db678f1ffa8879e (patch) | |
| tree | 555c8baf23a940083249b19e0e6a46554bdc0078 /src/panfrost | |
| parent | f5a35918db04dfe051e903a89323d9d8ba47c78a (diff) | |
panfrost: Add a sysval for local_work_dim
Fixes Piglit test get-work-dim.cl.
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8358>
Diffstat (limited to 'src/panfrost')
| -rw-r--r-- | src/panfrost/bifrost/bifrost_compile.c | 1 | ||||
| -rw-r--r-- | src/panfrost/midgard/midgard_compile.c | 1 | ||||
| -rw-r--r-- | src/panfrost/util/pan_ir.h | 1 | ||||
| -rw-r--r-- | src/panfrost/util/pan_sysval.c | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index e0cae3bb954..a6a70cc0311 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -689,6 +689,7 @@ bi_emit_intrinsic(bi_builder *b, nir_intrinsic_instr *instr) break; case nir_intrinsic_load_ssbo_address: + case nir_intrinsic_load_work_dim: bi_load_sysval(b, &instr->instr, 1, 0); break; diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 46eadd53c86..64123ea5311 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -1798,6 +1798,7 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr) break; case nir_intrinsic_load_ssbo_address: + case nir_intrinsic_load_work_dim: emit_sysval_read(ctx, &instr->instr, 1, 0); break; diff --git a/src/panfrost/util/pan_ir.h b/src/panfrost/util/pan_ir.h index bc318edf582..4c90587f35d 100644 --- a/src/panfrost/util/pan_ir.h +++ b/src/panfrost/util/pan_ir.h @@ -51,6 +51,7 @@ enum { PAN_SYSVAL_NUM_WORK_GROUPS = 5, PAN_SYSVAL_SAMPLER = 7, PAN_SYSVAL_LOCAL_GROUP_SIZE = 8, + PAN_SYSVAL_WORK_DIM = 9, }; #define PAN_TXS_SYSVAL_ID(texidx, dim, is_array) \ diff --git a/src/panfrost/util/pan_sysval.c b/src/panfrost/util/pan_sysval.c index 2129e5de565..f28d3a13821 100644 --- a/src/panfrost/util/pan_sysval.c +++ b/src/panfrost/util/pan_sysval.c @@ -60,6 +60,8 @@ panfrost_nir_sysval_for_intrinsic(nir_intrinsic_instr *instr) return PAN_SYSVAL_NUM_WORK_GROUPS; case nir_intrinsic_load_local_group_size: return PAN_SYSVAL_LOCAL_GROUP_SIZE; + case nir_intrinsic_load_work_dim: + return PAN_SYSVAL_WORK_DIM; case nir_intrinsic_load_ssbo_address: case nir_intrinsic_get_ssbo_size: return panfrost_sysval_for_ssbo(instr); |