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

radv: Properly enable Wave32 mode for NGG GS. 

The condition for enabling it was incorrect, and was always false.
Therefore, it was never really enabled.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10683>
This commit is contained in:
Timur Kristóf 2021-05-07 13:09:19 +02:00 committed by Marge Bot
parent 925bd5f990
commit 4bb2e42fb4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/amd/vulkan/radv_pipeline.c
View File

@ -2805,9 +2805,10 @@ radv_fill_shader_keys(struct radv_device *device, struct radv_shader_variant_key
static uint8_t
radv_get_wave_size(struct radv_device *device, const VkPipelineShaderStageCreateInfo *pStage,
gl_shader_stage stage, const struct radv_shader_variant_key *key)
gl_shader_stage stage, const struct radv_shader_variant_key *key,
const struct radv_shader_info *info)
{
if (stage == MESA_SHADER_GEOMETRY && !key->vs_common_out.as_ngg)
if (stage == MESA_SHADER_GEOMETRY && !info->is_ngg)
return 64;
else if (stage == MESA_SHADER_COMPUTE) {
return key->cs.subgroup_size;
@ -2918,7 +2919,7 @@ radv_fill_shader_info(struct radv_pipeline *pipeline,
for (int i = 0; i < MESA_SHADER_STAGES; i++) {
if (nir[i]) {
infos[i].wave_size = radv_get_wave_size(pipeline->device, pStages[i], i, &keys[i]);
infos[i].wave_size = radv_get_wave_size(pipeline->device, pStages[i], i, &keys[i], &infos[i]);
infos[i].ballot_bit_size =
radv_get_ballot_bit_size(pipeline->device, pStages[i], i, &keys[i]);
}