Fix for /**/ comments handling in DXC

NVIDIA-RTX · Jan 14, 2025 · 8048bab · 8048bab
1 parent b193a1d
commit 8048bab
Showing 1 changed file with 16 additions and 21 deletions.
diff --git a/Include/NRICompatibility.hlsli b/Include/NRICompatibility.hlsli
@@ -87,30 +87,25 @@ Draw parameters:
 #endif
 
 // Expected usage:
-/*
-// NVIDIA
-#if defined(NRI_DXBC) || defined(NRI_DXIL)
-    #define NV_SHADER_EXTN_SLOT NRI_MERGE_TOKENS(u, NRI_SHADER_EXT_REGISTER)
-    #ifdef NRI_DXIL
-        #define NV_SHADER_EXTN_REGISTER_SPACE space0
-    #endif
 
-    #include "../External/nvapi/nvHLSLExtns.h"
-#endif
+// NVIDIA
+//#if defined(NRI_DXBC) || defined(NRI_DXIL)
+//    #define NV_SHADER_EXTN_SLOT NRI_MERGE_TOKENS(u, NRI_SHADER_EXT_REGISTER)
+//    #ifdef NRI_DXIL
+//        #define NV_SHADER_EXTN_REGISTER_SPACE space0
+//    #endif
+//    #include "../External/nvapi/nvHLSLExtns.h"
+//#endif
 
 // AMD
-#ifdef NRI_DXIL
-    #define AMD_EXT_SHADER_INTRINSIC_UAV_OVERRIDE NRI_MERGE_TOKENS(u, NRI_SHADER_EXT_REGISTER)
-
-    #include "../External/amdags/ags_lib/hlsl/ags_shader_intrinsics_dx12.hlsl"
-#endif
-
-#ifdef NRI_DXBC
-    #define AmdDxExtShaderIntrinsicsUAVSlot NRI_MERGE_TOKENS(u, NRI_SHADER_EXT_REGISTER)
-
-    #include "../External/amdags/ags_lib/hlsl/ags_shader_intrinsics_dx11.hlsl"
-#endif
-*/
+//#ifdef NRI_DXIL
+//    #define AMD_EXT_SHADER_INTRINSIC_UAV_OVERRIDE NRI_MERGE_TOKENS(u, NRI_SHADER_EXT_REGISTER)
+//    #include "../External/amdags/ags_lib/hlsl/ags_shader_intrinsics_dx12.hlsl"
+//#endif
+//#ifdef NRI_DXBC
+//    #define AmdDxExtShaderIntrinsicsUAVSlot NRI_MERGE_TOKENS(u, NRI_SHADER_EXT_REGISTER)
+//    #include "../External/amdags/ags_lib/hlsl/ags_shader_intrinsics_dx11.hlsl"
+//#endif
 
 // Indirect commands filling // TODO: change to StructuredBuffers?
 #ifdef NRI_USE_BYTE_ADDRESS_BUFFER