Module: Mesa Branch: staging/23.0 Commit: a9b6993937a1dd0ae33705eba081b9ea82d7ea6b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9b6993937a1dd0ae33705eba081b9ea82d7ea6b
Author: Jesse Natalie <[email protected]> Date: Mon Mar 13 11:22:27 2023 -0700 microsoft/compiler: Fix setting bit 31 in feature flags Fixes: a84208ee ("microsoft/compiler: Fill out and sort the shader/module flags") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21913> (cherry picked from commit 273a7cf0e2619780ba6c86553f5cdd348afd27d8) --- .pick_status.json | 4 ++-- src/microsoft/compiler/nir_to_dxil.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3c06b5fab72..6b4cba8cefb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5539,7 +5539,7 @@ "description": "microsoft/compiler: Fix setting bit 31 in feature flags", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a84208ee4df8782a87464f7ed176d7499b20fc4f" }, @@ -6178,7 +6178,7 @@ "description": "nir/range_analysis: add missing masking of shift amounts", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "72ac3f60261a8510512861b93e843e695331e2ab" }, diff --git a/src/microsoft/compiler/nir_to_dxil.c b/src/microsoft/compiler/nir_to_dxil.c index 96a4af7e24e..24de4cdd1ea 100644 --- a/src/microsoft/compiler/nir_to_dxil.c +++ b/src/microsoft/compiler/nir_to_dxil.c @@ -1657,7 +1657,7 @@ get_module_flags(struct ntd_context *ctx) if (ctx->mod.feats.resource_descriptor_heap_indexing) flags |= (1 << 30); if (ctx->mod.feats.sampler_descriptor_heap_indexing) - flags |= (1 << 31); + flags |= (1ull << 31); if (ctx->mod.feats.atomic_int64_heap_resource) flags |= (1ull << 32); if (ctx->mod.feats.advanced_texture_ops)
