fix use of SLANG_RHI_ENABLE_NVAPI (#77)

shader-slang · Oct 11, 2024 · 9d13bd4 · 9d13bd4
1 parent dcaebd1
commit 9d13bd4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/d3d12/d3d12-helper-functions.cpp b/src/d3d12/d3d12-helper-functions.cpp
@@ -3,7 +3,7 @@
 #include "d3d12-query.h"
 #include "d3d12-transient-heap.h"
 
-#ifdef SLANG_RHI_ENABLE_NVAPI
+#if SLANG_RHI_ENABLE_NVAPI
 #include "../nvapi/nvapi-include.h"
 #endif
 
@@ -21,7 +21,7 @@ namespace rhi::d3d12 {
 
 bool isSupportedNVAPIOp(ID3D12Device* dev, uint32_t op)
 {
-#ifdef SLANG_RHI_ENABLE_NVAPI
+#if SLANG_RHI_ENABLE_NVAPI
     {
         bool isSupported;
         NvAPI_Status status = NvAPI_D3D12_IsNvShaderExtnOpCodeSupported(dev, NvU32(op), &isSupported);

diff --git a/src/d3d12/d3d12-pipeline.cpp b/src/d3d12/d3d12-pipeline.cpp
@@ -4,7 +4,7 @@
 #include "d3d12-shader-program.h"
 #include "d3d12-input-layout.h"
 
-#ifdef SLANG_RHI_ENABLE_NVAPI
+#if SLANG_RHI_ENABLE_NVAPI
 #include "../nvapi/nvapi-include.h"
 #endif
 
@@ -255,7 +255,7 @@ Result DeviceImpl::createComputePipeline2(const ComputePipelineDesc2& desc, ICom
                                      : program->m_rootObjectLayout->m_rootSignature;
     computeDesc.CS = {program->m_shaders[0].code.data(), SIZE_T(program->m_shaders[0].code.size())};
 
-#ifdef SLANG_RHI_ENABLE_NVAPI
+#if SLANG_RHI_ENABLE_NVAPI
     if (m_nvapi)
     {
         // Also fill the extension structure.

diff --git a/src/nvapi/nvapi-include.h b/src/nvapi/nvapi-include.h
@@ -2,7 +2,7 @@
 
 // A helper that makes the NVAPI available across targets
 
-#ifdef SLANG_RHI_ENABLE_NVAPI
+#if SLANG_RHI_ENABLE_NVAPI
 // On windows if we include NVAPI, we must include windows.h first
 
 #ifdef _WIN32

diff --git a/src/nvapi/nvapi-util.cpp b/src/nvapi/nvapi-util.cpp
@@ -7,7 +7,7 @@ static Result g_initStatus = SLANG_E_UNINITIALIZED;
 
 Result NVAPIUtil::initialize()
 {
-#ifdef SLANG_RHI_ENABLE_NVAPI
+#if SLANG_RHI_ENABLE_NVAPI
     if (g_initStatus == SLANG_E_UNINITIALIZED)
     {
         NvAPI_Status ret = NVAPI_OK;