From ce64cf0314a5593134c7142553430f75b632f62e Mon Sep 17 00:00:00 2001 From: Horatio Zhang Date: Fri, 6 Dec 2024 15:42:19 +0800 Subject: [PATCH] wsl/hsakmt: Fix conversion warnings by using 0 for Non-Pointers This patch addresses several compiler warnings related to the use of NULL with non-pointer types, such as D3DKMT_HANDLE, uint64_t, and uint32_t. Signed-off-by: Horatio Zhang Reviewed-by: tiancyin Part-of: --- inc/wddm/queue.h | 6 +++--- wddm/cmd_util.cpp | 4 ++-- wddm/queue.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/wddm/queue.h b/inc/wddm/queue.h index f09965620d..fc600562f5 100644 --- a/inc/wddm/queue.h +++ b/inc/wddm/queue.h @@ -69,9 +69,9 @@ public: uint32_t engine, bool use_hws = true) : device(device), - context(NULL), - queue(NULL), - syncobj(NULL), + context(0), + queue(0), + syncobj(0), sync_addr(NULL), cmdbuf(0), cmdbuf_addr(cmdbuf_addr), diff --git a/wddm/cmd_util.cpp b/wddm/cmd_util.cpp index d977eac731..476007b640 100644 --- a/wddm/cmd_util.cpp +++ b/wddm/cmd_util.cpp @@ -256,8 +256,8 @@ size_t CmdUtil::BuildDispatch( // This feature may be enabled as a side effect of indirect calls. // However, the compiler team confirmed that the dispatch id itself is not used, // so safe to send 0 for each dispatch. - dispatch.compute_user_data_regs.compute_user_data[sgpr_no++] = NULL; - dispatch.compute_user_data_regs.compute_user_data[sgpr_no++] = NULL; + dispatch.compute_user_data_regs.compute_user_data[sgpr_no++] = 0; + dispatch.compute_user_data_regs.compute_user_data[sgpr_no++] = 0; } if (AMD_HSA_BITS_GET(pInfo->pKernelObject->kernel_code_properties, AMD_KERNEL_CODE_PROPERTIES_ENABLE_SGPR_FLAT_SCRATCH_INIT)) { diff --git a/wddm/queue.cpp b/wddm/queue.cpp index edbfe05e43..99f8bebd2e 100644 --- a/wddm/queue.cpp +++ b/wddm/queue.cpp @@ -528,7 +528,7 @@ uint64_t ComputeQueue::GetKernelObjAddr(uint64_t addr) const { auto ret = hsakmt_hsa_ven_amd_loader_query_host_address(reinterpret_cast(addr), reinterpret_cast(&host_addr)); if (ret == HSA_STATUS_ERROR_INVALID_ARGUMENT) { - return NULL; + return 0; } return host_addr;