diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-09-15 02:00:29 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-09-15 02:00:29 +0000 |
| commit | d1be8bd4e0efa680e897774befdbb80a3d6b43b6 (patch) | |
| tree | ca44df5e52f67a017809179a4058f2b401b136b7 | |
| parent | Fixe Linux/Mac build - part II (diff) | |
| download | DiligentCore-d1be8bd4e0efa680e897774befdbb80a3d6b43b6.tar.gz DiligentCore-d1be8bd4e0efa680e897774befdbb80a3d6b43b6.zip | |
Fixed shader compiler warnings in shader conversion tests
4 files changed, 9 insertions, 17 deletions
diff --git a/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWBuff.hlsl b/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWBuff.hlsl index 589d4057..724efec3 100644 --- a/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWBuff.hlsl +++ b/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWBuff.hlsl @@ -42,10 +42,8 @@ void TestLoad() -void TestStore() +void TestStore(uint3 Location) { - int4 Location = int4(2, 5, 1, 10); - //Buffer { TexBuff_F[Location.x] = 1.0; @@ -56,7 +54,7 @@ void TestStore() Data0.Data = float4(0.0, 1.0, 2.0, 3.0); RWStructBuff0[Location.x] = Data0; RWStructBuff1[Location.z] = Data0; - RWStructBuff2[Location.w] = Data0; + RWStructBuff2[Location.y] = Data0; } @@ -77,5 +75,5 @@ void TestCS(CSInput In, { TestGetDimensions(); TestLoad(); - TestStore(); + TestStore(GTid); } diff --git a/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex1D.hlsl b/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex1D.hlsl index 584e0fea..398ab835 100644 --- a/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex1D.hlsl +++ b/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex1D.hlsl @@ -93,10 +93,8 @@ void TestLoad() -void TestStore() +void TestStore(uint2 Location) { - int4 Location = int4(2, 5, 1, 10); - // Texture1D { Tex1D_F1[Location.x] = 1.0; @@ -130,5 +128,5 @@ void TestCS(CSInput In, { TestGetDimensions(); TestLoad(); - TestStore(); + TestStore(GTid.xy); } diff --git a/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_1.hlsl b/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_1.hlsl index 4168f82c..431ca597 100644 --- a/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_1.hlsl +++ b/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_1.hlsl @@ -91,10 +91,8 @@ void TestLoad() -void TestStore() +void TestStore(uint2 Location) { - int4 Location = int4(2, 5, 1, 10); - //Texture2D { Tex2D_F1[Location.xy] = 10.0; @@ -148,7 +146,7 @@ void TestCS(CSInput In, { TestGetDimensions(); TestLoad(); - TestStore(); + TestStore(GTid.xy); uint uOldVal; int iOldVal; diff --git a/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_2.hlsl b/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_2.hlsl index 192851a8..f8d3b4f4 100644 --- a/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_2.hlsl +++ b/Tests/DiligentCoreAPITest/assets/shaders/HLSL2GLSLConverter/CS_RWTex2D_2.hlsl @@ -78,10 +78,8 @@ void TestLoad() -void TestStore() +void TestStore(uint3 Location) { - int4 Location = int4(2, 5, 1, 10); - //Texture2DArray { Tex2D_F_A[Location.xyz] = 30.0; @@ -120,5 +118,5 @@ void TestCS(CSInput In, { TestGetDimensions(); TestLoad(); - TestStore(); + TestStore(GTid); } |