diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2020-12-17 02:08:05 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2021-03-01 23:55:33 +0530 |
| commit | bbedfb41834602930c0ec3f018dadfd3229a030e (patch) | |
| tree | 357f55b4ed6c3cdf8f4565a5648a763b264bd62c | |
| parent | e699a9e2194e8c680d3651ad260c587619271609 (diff) | |
| download | mesa3d-bbedfb41834602930c0ec3f018dadfd3229a030e.tar.gz | |
nir: Fix implicit conversion build -Werror on AOSP
Fix couple of following implicit conversion build -Werror
by type casting them explicitly:
"
src/compiler/nir/nir_opt_copy_prop_vars.c:193:16: error: implicit conversion from 'unsigned int' to 'nir_component_mask_t' (aka 'unsigned short') changes value from 4294967295 to 65535 [-Werror,-Wconstant-conversion]
BITFIELD_MASK(glsl_get_vector_elements(payload->type));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/util/macros.h:326:18: note: expanded from macro 'BITFIELD_MASK'
((b) == 32 ? (~0u) : BITFIELD_BIT((b) % 32) - 1)
^~~
"
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: I9208204b706fac23f29eee57d497d0f329f5f972
| -rw-r--r-- | src/compiler/nir/nir_opt_copy_prop_vars.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c index 91c8277658b..823bc763c68 100644 --- a/src/compiler/nir/nir_opt_copy_prop_vars.c +++ b/src/compiler/nir/nir_opt_copy_prop_vars.c @@ -190,7 +190,7 @@ gather_vars_written(struct copy_prop_var_state *state, nir_src_as_deref(*nir_get_shader_call_payload_src(intrin)); nir_component_mask_t mask = - BITFIELD_MASK(glsl_get_vector_elements(payload->type)); + (nir_component_mask_t) BITFIELD_MASK(glsl_get_vector_elements(payload->type)); struct hash_entry *ht_entry = _mesa_hash_table_search(written->derefs, payload); @@ -1115,7 +1115,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state, nir_deref_instr *payload = nir_src_as_deref(*nir_get_shader_call_payload_src(intrin)); nir_component_mask_t full_mask = - BITFIELD_MASK(glsl_get_vector_elements(payload->type)); + (nir_component_mask_t) BITFIELD_MASK(glsl_get_vector_elements(payload->type)); kill_aliases(copies, payload, full_mask); break; } |