From ee544f8642b69d2ccc9fa6e42f783cd137aa2c71 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Mon, 19 Apr 2021 10:08:52 -0700 Subject: [PATCH] microsoft/compiler: Fix MSVC warning C4334 (32bit shift cast to 64bit) Reviewed-by: Jason Ekstrand Reviewed-By: Bill Kristiansen Cc: mesa-stable@lists.freedesktop.org Part-of: (cherry picked from commit 67b5fba62ae578f4748ec9acd667d7b74644cb3c) --- .pick_status.json | 2 +- src/microsoft/compiler/nir_to_dxil.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cb1b3762ca4..0dccd66c9b5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -409,7 +409,7 @@ "description": "microsoft/compiler: Fix MSVC warning C4334 (32bit shift cast to 64bit)", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/microsoft/compiler/nir_to_dxil.c b/src/microsoft/compiler/nir_to_dxil.c index 597dd4d59ff..feec188dd3f 100644 --- a/src/microsoft/compiler/nir_to_dxil.c +++ b/src/microsoft/compiler/nir_to_dxil.c @@ -4379,7 +4379,7 @@ nir_var_to_dxil_sysvalue_type(nir_variable *var, uint64_t other_stage_mask) case VARYING_SLOT_CLIP_DIST0: case VARYING_SLOT_CLIP_DIST1: case VARYING_SLOT_PSIZ: - if (!((1 << var->data.location) & other_stage_mask)) + if (!((1ull << var->data.location) & other_stage_mask)) return DXIL_SYSVALUE; FALLTHROUGH; default: