[Mesa-dev] [PATCH] Revert "radv: do not load unused gl_LocalInvocationID/gl_WorkGroupID components"

[Bas Nieuwenhuizen]

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

On Fri, Dec 15, 2017 at 4:01 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> 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 <samuel.pitoiset at gmail.com>
> ---
>  src/amd/vulkan/radv_shader.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
> index ab8ba42511..f96b0c07f1 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;
> --
> 2.15.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev