diff --git a/.pick_status.json b/.pick_status.json index 73ed382a24b..8e7b0747414 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -334,7 +334,7 @@ "description": "nvk: use `||` instead of `|` between bools", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "dadf9d59e6f9e0c4a7a7e84af6eca85efe24476a", "notes": null diff --git a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c index d3d98667b4c..c4d4f7bf17c 100644 --- a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c +++ b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c @@ -682,12 +682,15 @@ nvk_nir_lower_descriptors(nir_shader *nir, * are left and lowers them to slightly less efficient but variable- * pointers-correct versions. */ - return nir_shader_instructions_pass(nir, try_lower_descriptors_instr, - nir_metadata_block_index | - nir_metadata_dominance, - (void *)&ctx) | - nir_shader_instructions_pass(nir, lower_ssbo_descriptor_instr, - nir_metadata_block_index | - nir_metadata_dominance, - (void *)&ctx); + bool pass_lower_descriptors = + nir_shader_instructions_pass(nir, try_lower_descriptors_instr, + nir_metadata_block_index | + nir_metadata_dominance, + (void *)&ctx); + bool pass_lower_ssbo = + nir_shader_instructions_pass(nir, lower_ssbo_descriptor_instr, + nir_metadata_block_index | + nir_metadata_dominance, + (void *)&ctx); + return pass_lower_descriptors || pass_lower_ssbo; }