nvk: use || instead of | between bools

We have to split each call into its own variable, because simply
replacing `|` with `||` would short-circuit the right side when the left
side succeeds.

Fixes: dadf9d59e6 ("nvk: Add support for variable pointers")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26509>
This commit is contained in:
Eric Engestrom
2023-12-04 18:34:33 +00:00
committed by Marge Bot
parent 3115e6e211
commit 81ec1fa0b5

View File

@@ -669,12 +669,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;
}