fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir: Fix MSVC warning C4334 (32bit shift cast to 64bit)

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-By: Bill Kristiansen <billkris@microsoft.com>
Cc: mesa-stable@lists.freedesktop.org
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10331>
This commit is contained in:
Jesse Natalie 2021-04-19 10:07:21 -07:00 • committed by Marge Bot
parent 750ddf3239
commit 09440ce3fb
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/nir/nir_builtin_builder.c
View file

@ -76,7 +76,7 @@ nir_nextafter(nir_builder *b, nir_ssa_def *x, nir_ssa_def *y)
nir_ssa_def *conddir = nir_flt(b, x, y);
nir_ssa_def *condzero = nir_feq(b, x, zero);
uint64_t sign_mask = 1 << (x->bit_size - 1);
uint64_t sign_mask = 1ull << (x->bit_size - 1);
uint64_t min_abs = 1;
if (nir_is_denorm_flush_to_zero(b->shader->info.float_controls_execution_mode, x->bit_size)) {

2
src/compiler/nir/nir_opt_copy_prop_vars.c
View file

@ -108,7 +108,7 @@ static bool
value_equals_store_src(struct value *value, nir_intrinsic_instr *intrin)
{
assert(intrin->intrinsic == nir_intrinsic_store_deref);
uintptr_t write_mask = nir_intrinsic_write_mask(intrin);
nir_component_mask_t write_mask = nir_intrinsic_write_mask(intrin);
for (unsigned i = 0; i < intrin->num_components; i++) {
if ((write_mask & (1 << i)) &&

2
src/gallium/auxiliary/nir/nir_to_tgsi.c
View file

@ -1538,7 +1538,7 @@ ntt_emit_load_input(struct ntt_compile *c, nir_intrinsic_instr *instr)
* emit the extra TGSI interp instruction, we can just read the
* input.
*/
if (c->centroid_inputs & (1 << nir_intrinsic_base(instr))) {
if (c->centroid_inputs & (1ull << nir_intrinsic_base(instr))) {
ntt_store(c, &instr->dest, input);
} else {
ureg_INTERP_CENTROID(c->ureg, ntt_get_dest(c, &instr->dest),

2
src/gallium/auxiliary/nir/tgsi_to_nir.c
View file

@ -362,7 +362,7 @@ ttn_emit_declaration(struct ttn_compile *c)
c->inputs[idx] = var;
for (int i = 0; i < array_size; i++)
b->shader->info.inputs_read |= 1 << (var->data.location + i);
b->shader->info.inputs_read |= 1ull << (var->data.location + i);
break;
case TGSI_FILE_OUTPUT: {