diff options
| author | Samuel Pitoiset <[email protected]> | 2017-12-15 16:01:56 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-12-18 11:50:02 +0100 |
| commit | bb01661918119f00dbef1ea07a3af3ebea537114 (patch) | |
| tree | d75636617e7ab17c643fb11af2f130858b4c0da0 | |
| parent | 1bdeac545f4ea9f7ca6947f5da7fcf4f5b3010dc (diff) | |
Revert "radv: do not load unused gl_LocalInvocationID/gl_WorkGroupID components"
This reverts commit 2294d35b243dee15af15895e876a63b7d22e48cc.
We can't do this without adjusting the input SGPRs/VGPRs logic.
For now, just revert it. I will send a proper solution later.
It fixes a rendering issue in F1 2017 that CTS didn't catch up.
Signed-off-by: Samuel Pitoiset <[email protected]>
Tested-by: Alex Smith <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_shader.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index ab8ba42511e..f96b0c07f1e 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -395,11 +395,8 @@ radv_fill_shader_variant(struct radv_device *device, case MESA_SHADER_COMPUTE: { struct ac_shader_info *info = &variant->info.info; variant->rsrc2 |= - S_00B84C_TGID_X_EN(info->cs.uses_block_id[0]) | - S_00B84C_TGID_Y_EN(info->cs.uses_block_id[1]) | - S_00B84C_TGID_Z_EN(info->cs.uses_block_id[2]) | - S_00B84C_TIDIG_COMP_CNT(info->cs.uses_thread_id[2] ? 2 : - info->cs.uses_thread_id[1] ? 1 : 0) | + S_00B84C_TGID_X_EN(1) | S_00B84C_TGID_Y_EN(1) | + S_00B84C_TGID_Z_EN(1) | S_00B84C_TIDIG_COMP_CNT(2) | S_00B84C_TG_SIZE_EN(info->cs.uses_local_invocation_idx) | S_00B84C_LDS_SIZE(variant->config.lds_size); break; |