Mesa (main): radv: Remove unnecessary null check.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Jun 21 04:25:08 UTC 2022


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

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Thu Jun 16 16:03:20 2022 -0700

radv: Remove unnecessary null check.

Fix defect reported by Coverity Scan.

Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking subpass suggests that it may be null,
but it has already been dereferenced on all paths leading to the check.

Fixes: 779e09639b5 ("radv: configure DB_Z_INFO.NUM_SAMPLES correctly on GFX11")
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17100>

---

 src/amd/vulkan/radv_cmd_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index aac0bec4244..54e1b39b79e 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2626,7 +2626,7 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer)
        * VRS and occlusion queries if depth and stencil are not bound.
        */
       if (cmd_buffer->device->physical_device->rad_info.gfx_level == GFX11)
-         num_samples = subpass ? util_logbase2(subpass->max_sample_count) : 0;
+         num_samples = util_logbase2(subpass->max_sample_count);
 
       if (cmd_buffer->device->physical_device->rad_info.gfx_level == GFX9)
          radeon_set_context_reg_seq(cmd_buffer->cs, R_028038_DB_Z_INFO, 2);



More information about the mesa-commit mailing list