Added VK_IMAGE_FORMAT shader macro

Author: TheMostDiligent

Graphics/HLSL2GLSLConverterLib/include/GLSLDefinitions.h

@@ -1361,4 +1361,6 @@ void _GetGLTessLevelInner(out float InnerLevel)
 
 #endif
 
+#define VK_IMAGE_FORMAT(format)
+
 #endif // _GLSL_DEFINITIONS_

Graphics/ShaderTools/include/HLSLDefinitions.fxh

@@ -78,5 +78,11 @@ float2x2 MatrixFromRows(float2 row0, float2 row1)
     return float2x2(row0, row1);
 }
 
+#if defined(VULKAN) && defined(DXCOMPILER)
+#   define VK_IMAGE_FORMAT(format) [[vk::image_format(format)]]
+#else
+#   define VK_IMAGE_FORMAT(format)
+#endif
+
 #endif // _HLSL_DEFINITIONS_
 

Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex1D.hlsl

@@ -25,9 +25,9 @@ cbuffer cbTest6
 int cbuffer_fake;
 int fakecbuffer;
 
-RWTexture1D<float /* format=r32f */ >Tex1D_F1 /*comment*/:/*comment*/ register(u0)/*comment*/;
-RWTexture1D<int2  /*format=rg32i*/ >Tex1D_I;
-RWTexture1D<uint4 /* format= rgba32ui */ >Tex1D_U;
+VK_IMAGE_FORMAT("r32f") RWTexture1D<float /* format=r32f */ >Tex1D_F1 /*comment*/:/*comment*/ register(u0)/*comment*/;
+VK_IMAGE_FORMAT("r32i") RWTexture1D<int2  /*format=rg32i*/ >Tex1D_I;
+VK_IMAGE_FORMAT("rgba32ui") RWTexture1D<uint4 /* format= rgba32ui */ >Tex1D_U;
 
 RWTexture1DArray </* format = r32f */ float >  Tex1D_F_A : register(u1);
 RWTexture1DArray </* format = rg16i */ int2 >   Tex1D_I_A;

Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_1.hlsl

@@ -29,8 +29,8 @@ RWTexture2D<float4/* format = rgba32f */>Tex2D_F1/*comment*/: /*comment*/registe
 RWTexture2D<float/* format = r32f */>Tex2D_F3: register(u3),/*cmt*/Tex2D_F4,  Tex2D_F5
 /*comment*/:/*comment*/
 register(u4);
-RWTexture2D<int4/* format = rgba16i */>Tex2D_I;
-RWTexture2D<uint/* format = r32ui */>Tex2D_U;
+VK_IMAGE_FORMAT("rgba16i") RWTexture2D<int4/* format = rgba16i */>Tex2D_I;
+VK_IMAGE_FORMAT("r32ui")   RWTexture2D<uint/* format = r32ui */>Tex2D_U;
 
 
 int GlobalIntVar;Texture2D Tex2D_Test1:register(t0);Texture2D Tex2D_Test2;/*Comment* / *//* /** Comment2*/Texture2D Tex2D_Test3 /*Cmnt*/: /*comment*/register(t1)/*comment*/,/*comment*/

Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_2.hlsl

@@ -8,6 +8,7 @@ RWTexture2DArray <int2// format = rg8i
 RWTexture2DArray <uint4// format = rgba8ui
                   >  Tex2D_U_A;
 
+VK_IMAGE_FORMAT("rgba32f")
 RWTexture3D< float4/*
 format
 =

Tests/DiligentCoreAPITest/include/InlineShaders/RayTracingTestHLSL.h

@@ -46,10 +46,7 @@ const std::string RayTracingTest1_RG = RayTracingTest_Payload +
 R"hlsl(
 RaytracingAccelerationStructure g_TLAS : register(t0);
 
-#ifdef VULKAN
-[[vk::image_format("rgba8")]]
-#endif
-RWTexture2D<float4> g_ColorBuffer : register(u0);
+VK_IMAGE_FORMAT("rgba8") RWTexture2D<float4> g_ColorBuffer : register(u0);
 
 [shader("raygeneration")]
 void main()
@@ -100,10 +97,7 @@ const std::string RayTracingTest2_RG = RayTracingTest_Payload +
 R"hlsl(
 RaytracingAccelerationStructure g_TLAS : register(t0);
 
-#ifdef VULKAN
-[[vk::image_format("rgba8")]]
-#endif
-RWTexture2D<float4> g_ColorBuffer : register(u0);
+VK_IMAGE_FORMAT("rgba8") RWTexture2D<float4> g_ColorBuffer : register(u0);
 
 [shader("raygeneration")]
 void main()
@@ -166,10 +160,7 @@ const std::string RayTracingTest3_RG = RayTracingTest_Payload +
 R"hlsl(
 RaytracingAccelerationStructure g_TLAS : register(t0);
 
-#ifdef VULKAN
-[[vk::image_format("rgba8")]]
-#endif
-RWTexture2D<float4> g_ColorBuffer : register(u0);
+VK_IMAGE_FORMAT("rgba8") RWTexture2D<float4> g_ColorBuffer : register(u0);
 
 [shader("raygeneration")]
 void main()
@@ -253,10 +244,7 @@ const std::string RayTracingTest4_RG = RayTracingTest_Payload +
 R"hlsl(
 RaytracingAccelerationStructure g_TLAS : register(t0);
 
-#ifdef VULKAN
-[[vk::image_format("rgba8")]]
-#endif
-RWTexture2D<float4> g_ColorBuffer : register(u0);
+VK_IMAGE_FORMAT("rgba8") RWTexture2D<float4> g_ColorBuffer : register(u0);
 
 [shader("raygeneration")]
 void main()
@@ -353,10 +341,7 @@ const std::string RayTracingTest5_RG = RayTracingTest_Payload +
 R"hlsl(
 RaytracingAccelerationStructure g_TLAS;
 
-#ifdef VULKAN
-[[vk::image_format("rgba8")]]
-#endif
-RWTexture2D<float4> g_ColorBuffer;
+VK_IMAGE_FORMAT("rgba8") RWTexture2D<float4> g_ColorBuffer;
 
 [shader("raygeneration")]
 void main()
@@ -442,10 +427,7 @@ void main(inout RTPayload payload, in BuiltInTriangleIntersectionAttributes attr
 const std::string RayTracingTest6_RG{R"hlsl(
 RaytracingAccelerationStructure g_TLAS;
 
-#ifdef VULKAN
-[[vk::image_format("rgba8")]]
-#endif
-RWTexture2D<float4> g_ColorBuffer;
+VK_IMAGE_FORMAT("rgba8") RWTexture2D<float4> g_ColorBuffer;
 
 float4 HitShader(float2 attrBarycentrics)
 {
@@ -563,10 +545,7 @@ float4 main(in PSInput PSIn) : SV_Target
 const std::string RayTracingTest8_CS{R"hlsl(
 RaytracingAccelerationStructure g_TLAS;
 
-#ifdef VULKAN
-[[vk::image_format("rgba8")]]
-#endif
-RWTexture2D<float4> g_ColorBuffer;
+VK_IMAGE_FORMAT("rgba8") RWTexture2D<float4> g_ColorBuffer;
 
 float4 HitShader(float2 attrBarycentrics)
 {

Tests/DiligentCoreAPITest/src/ArchiveTest.cpp

@@ -1298,10 +1298,7 @@ namespace HLSL
 // Test shader source as string
 const std::string ComputePSOTest_CS{R"(
 
-#if defined(VULKAN) && defined(DXCOMPILER)
-[[vk::image_format("rgba8")]]
-#endif
-RWTexture2D</*format=rgba8*/ float4> g_tex2DUAV : register(u0);
+VK_IMAGE_FORMAT("rgba8") RWTexture2D</*format=rgba8*/ float4> g_tex2DUAV : register(u0);
 
 [numthreads(16, 16, 1)]
 void main(uint3 DTid : SV_DispatchThreadID)

Tests/DiligentCoreAPITest/src/D3D12/RayTracingReferenceD3D12.cpp

@@ -36,6 +36,8 @@
 #include "InlineShaders/RayTracingTestHLSL.h"
 #include "RayTracingTestConstants.hpp"
 
+#include "dxc/dxcapi.h"
+
 namespace Diligent
 {
 
@@ -120,8 +122,11 @@ struct RTSubobjectsHelper
 
     void SetDxilLibrary(Uint32 Index, const String& Source, const wchar_t* ExportName)
     {
+        static constexpr DxcDefine Defines[]{
+            {L"VK_IMAGE_FORMAT(x)", L""},
+        };
         TestingEnvironmentD3D12* pEnv = TestingEnvironmentD3D12::GetInstance();
-        HRESULT                  hr   = pEnv->CompileDXILShader(Source, L"main", nullptr, 0, L"lib_6_3", &ShadersByteCode[Index]);
+        HRESULT                  hr   = pEnv->CompileDXILShader(Source, L"main", Defines, _countof(Defines), L"lib_6_3", &ShadersByteCode[Index]);
         ASSERT_HRESULT_SUCCEEDED(hr) << "Failed to compile ray tracing shader";
 
         D3D12_EXPORT_DESC&       RGExportDesc = ExportDescs[Index];