Module: Mesa Branch: staging/22.3 Commit: e448321812710e28815c64f5e3a7cde35735d3a9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e448321812710e28815c64f5e3a7cde35735d3a9
Author: GH Cao <[email protected]> Date: Fri Jan 13 01:20:25 2023 +0800 dzn: Declare debug only root_dwords as ASSERTED Such variable is only used in assert(), so declare it as ASSERTED. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7885 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7234 Signed-off-by: GH Cao <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20676> (cherry picked from commit af55e36d798b91b86795544aac2d9e3983cde207) --- .pick_status.json | 2 +- src/microsoft/vulkan/dzn_descriptor_set.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8af1e969192..7c4410feb7e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -11866,7 +11866,7 @@ "description": "dzn: Declare debug only root_dwords as ASSERTED", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/microsoft/vulkan/dzn_descriptor_set.c b/src/microsoft/vulkan/dzn_descriptor_set.c index fe7b7b212c4..660933fed7a 100644 --- a/src/microsoft/vulkan/dzn_descriptor_set.c +++ b/src/microsoft/vulkan/dzn_descriptor_set.c @@ -645,7 +645,7 @@ dzn_pipeline_layout_create(struct dzn_device *device, D3D12_ROOT_PARAMETER1 root_params[MAX_ROOT_PARAMS] = { 0 }; D3D12_DESCRIPTOR_RANGE1 *range_ptr = ranges; D3D12_ROOT_PARAMETER1 *root_param; - uint32_t root_dwords = 0; + ASSERTED uint32_t root_dwords = 0; for (uint32_t i = 0; i < MAX_SHADER_VISIBILITIES; i++) { dzn_foreach_pool_type (type) {
