Mesa (main): d3d12: MSVC warning around operator precedence causing uint32_t==bool

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed May 18 16:37:13 UTC 2022


Module: Mesa
Branch: main
Commit: 29a8f1f03bed317370e07288fd9d4b85a24562e6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=29a8f1f03bed317370e07288fd9d4b85a24562e6

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Wed May 18 09:13:32 2022 -0700

d3d12: MSVC warning around operator precedence causing uint32_t==bool

Fixes: b171a6ba ("d3d12: Add video encode implementation of pipe_video_codec")
Reviewed-by: Sil Vilerino <sivileri at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16588>

---

 .../drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp b/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp
index dbdd7a9e544..e068bc5854e 100644
--- a/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_video_encoder_references_manager_h264.cpp
@@ -63,7 +63,7 @@ d3d12_video_encoder_references_manager_h264::reset_gop_tracking_and_dpb()
 
    // After clearing the DPB, outstanding used allocations should be 1u only for the first allocation for the
    // reconstructed picture of the initial IDR in the GOP
-   assert(m_rDPBStorageManager.get_number_of_in_use_allocations() == m_gopHasInterFrames ? 1u : 0u);
+   assert(m_rDPBStorageManager.get_number_of_in_use_allocations() == (m_gopHasInterFrames ? 1u : 0u));
    assert(m_rDPBStorageManager.get_number_of_tracked_allocations() <=
           (m_MaxDPBCapacity + 1));   // pool is not extended beyond maximum expected usage
 }



More information about the mesa-commit mailing list