From ae1a5e40880808252c68eb51e44051b32a34d399 Mon Sep 17 00:00:00 2001 From: Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> Date: Thu, 24 Apr 2025 10:23:06 +0200 Subject: update slang-rhi (#6587) * update slang-rhi submodule * slang-rhi API changes * disable agility sdk * fix texture creation * update formats in tests * Extent3D rename * use 1 mip level for 1D textures for Metal * fix texture upload * update to latest slang-rhi * update slang-rhi * format code * update slang-rhi * do not run texture-intrinsics test on metal * update slang-rhi * deal with failing tests * fix more tests * update slang-rhi --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> Co-authored-by: Simon Kallweit --- tests/compute/half-rw-texture-convert.slang | 8 ++++---- tests/compute/half-rw-texture-convert2.slang | 6 +++--- tests/compute/half-rw-texture-simple.slang | 6 +++--- tests/compute/half-texture-simple.slang | 16 ++++++++-------- tests/compute/rw-texture-simple.slang | 6 +++--- tests/compute/texture-subscript-multisample.slang | 4 ++-- tests/compute/texture-subscript.slang | 8 ++++---- 7 files changed, 27 insertions(+), 27 deletions(-) (limited to 'tests/compute') diff --git a/tests/compute/half-rw-texture-convert.slang b/tests/compute/half-rw-texture-convert.slang index 1d98dd770..a126a3cb5 100644 --- a/tests/compute/half-rw-texture-convert.slang +++ b/tests/compute/half-rw-texture-convert.slang @@ -11,15 +11,15 @@ // Note that this test is a little silly. The output does not confirm that the write actually worked. // half-rw-texture-convert2.slang tests this -//TEST_INPUT: RWTexture2D(format=R16_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D +//TEST_INPUT: RWTexture2D(format=R16Float, size=4, content = one, mipMaps = 1):name rwt2D [format("r16f")] RWTexture2D rwt2D; -//TEST_INPUT: RWTexture2D(format=R16G16_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D_2 +//TEST_INPUT: RWTexture2D(format=RG16Float, size=4, content = one, mipMaps = 1):name rwt2D_2 [format("rg16f")] RWTexture2D rwt2D_2; -//TEST_INPUT: RWTexture2D(format=R16G16B16A16_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D_4 +//TEST_INPUT: RWTexture2D(format=RGBA16Float, size=4, content = one, mipMaps = 1):name rwt2D_4 [format("rgba16f")] RWTexture2D rwt2D_4; @@ -41,4 +41,4 @@ void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) rwt2D_4[uint2(idx, idx)] = float4(val + 1, val - 1, val * 4, val * -4); outputBuffer[idx] = val; -} \ No newline at end of file +} diff --git a/tests/compute/half-rw-texture-convert2.slang b/tests/compute/half-rw-texture-convert2.slang index 8b9a329bc..6f17251c0 100644 --- a/tests/compute/half-rw-texture-convert2.slang +++ b/tests/compute/half-rw-texture-convert2.slang @@ -8,15 +8,15 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -shaderobj -render-features half -//TEST_INPUT: RWTexture2D(format=R16_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D +//TEST_INPUT: RWTexture2D(format=R16Float, size=4, content = one, mipMaps = 1):name rwt2D [format("r16f")] RWTexture2D rwt2D; -//TEST_INPUT: RWTexture2D(format=R16G16_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D_2 +//TEST_INPUT: RWTexture2D(format=RG16Float, size=4, content = one, mipMaps = 1):name rwt2D_2 [format("rg16f")] RWTexture2D rwt2D_2; -//TEST_INPUT: RWTexture2D(format=R16G16B16A16_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D_4 +//TEST_INPUT: RWTexture2D(format=RGBA16Float, size=4, content = one, mipMaps = 1):name rwt2D_4 [format("rgba16f")] RWTexture2D rwt2D_4; diff --git a/tests/compute/half-rw-texture-simple.slang b/tests/compute/half-rw-texture-simple.slang index 739abfab7..498f00772 100644 --- a/tests/compute/half-rw-texture-simple.slang +++ b/tests/compute/half-rw-texture-simple.slang @@ -10,13 +10,13 @@ //DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -shaderobj -render-features half -//TEST_INPUT: RWTexture1D(format=R16_FLOAT, size=4, content = one, mipMaps = 1):name rwt1D +//TEST_INPUT: RWTexture1D(format=R16Float, size=4, content = one, mipMaps = 1):name rwt1D RWTexture1D rwt1D; -//TEST_INPUT: RWTexture2D(format=R16_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D +//TEST_INPUT: RWTexture2D(format=R16Float, size=4, content = one, mipMaps = 1):name rwt2D RWTexture2D rwt2D; -//TEST_INPUT: RWTexture2D(format=R16G16B16A16_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D_4 +//TEST_INPUT: RWTexture2D(format=RGBA16Float, size=4, content = one, mipMaps = 1):name rwt2D_4 RWTexture2D rwt2D_4; //TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer diff --git a/tests/compute/half-texture-simple.slang b/tests/compute/half-texture-simple.slang index 5ddd84d64..986c80189 100644 --- a/tests/compute/half-texture-simple.slang +++ b/tests/compute/half-texture-simple.slang @@ -7,23 +7,23 @@ //TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj // Doesn't work on CUDA, not clear why yet -//DISABLE_TEST_INPUT: Texture1D(format=R16_FLOAT, size=4, content = one, mipMaps=1):name tLoad1D +//DISABLE_TEST_INPUT: Texture1D(format=R16Float, size=4, content = one, mipMaps=1):name tLoad1D //Texture1D tLoad1D; -//TEST_INPUT: Texture1D(format=R16_FLOAT, size=4, content = one):name t1D +//TEST_INPUT: Texture1D(format=R16Float, size=4, content = one):name t1D Texture1D t1D; -//TEST_INPUT: Texture2D(format=R16_FLOAT, size=4, content = one):name t2D +//TEST_INPUT: Texture2D(format=R16Float, size=4, content = one):name t2D Texture2D t2D; -//TEST_INPUT: Texture3D(format=R16_FLOAT, size=4, content = one):name t3D +//TEST_INPUT: Texture3D(format=R16Float, size=4, content = one):name t3D Texture3D t3D; -//TEST_INPUT: TextureCube(format=R16_FLOAT, size=4, content = one):name tCube +//TEST_INPUT: TextureCube(format=R16Float, size=4, content = one):name tCube TextureCube tCube; -//TEST_INPUT: Texture1D(format=R16_FLOAT, size=4, content = one, arrayLength=2):name t1DArray +//TEST_INPUT: Texture1D(format=R16Float, size=4, content = one, arrayLength=2):name t1DArray Texture1DArray t1DArray; -//TEST_INPUT: Texture2D(format=R16_FLOAT, size=4, content = one, arrayLength=2):name t2DArray +//TEST_INPUT: Texture2D(format=R16Float, size=4, content = one, arrayLength=2):name t2DArray Texture2DArray t2DArray; -//TEST_INPUT: TextureCube(format=R16_FLOAT, size=4, content = one, arrayLength=2):name tCubeArray +//TEST_INPUT: TextureCube(format=R16Float, size=4, content = one, arrayLength=2):name tCubeArray TextureCubeArray tCubeArray; //TEST_INPUT: Sampler:name samplerState diff --git a/tests/compute/rw-texture-simple.slang b/tests/compute/rw-texture-simple.slang index 5113dc807..f5befcd57 100644 --- a/tests/compute/rw-texture-simple.slang +++ b/tests/compute/rw-texture-simple.slang @@ -8,11 +8,11 @@ //TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -shaderobj -//TEST_INPUT: RWTexture1D(format=R32_FLOAT, size=4, content = one, mipMaps = 1):name rwt1D +//TEST_INPUT: RWTexture1D(format=R32Float, size=4, content = one, mipMaps = 1):name rwt1D RWTexture1D rwt1D; -//TEST_INPUT: RWTexture2D(format=R32_FLOAT, size=4, content = one, mipMaps = 1):name rwt2D +//TEST_INPUT: RWTexture2D(format=R32Float, size=4, content = one, mipMaps = 1):name rwt2D RWTexture2D rwt2D; -//TEST_INPUT: RWTexture3D(format=R32_FLOAT, size=4, content = one, mipMaps = 1):name rwt3D +//TEST_INPUT: RWTexture3D(format=R32Float, size=4, content = one, mipMaps = 1):name rwt3D RWTexture3D rwt3D; //TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer diff --git a/tests/compute/texture-subscript-multisample.slang b/tests/compute/texture-subscript-multisample.slang index 5bd40ae66..0c120d87c 100644 --- a/tests/compute/texture-subscript-multisample.slang +++ b/tests/compute/texture-subscript-multisample.slang @@ -8,10 +8,10 @@ //METAL_ERROR: error 41402 //METALLIB: error 41402 -//TEST_INPUT: RWTexture2D(format=R8G8B8A8_SINT, size=4, content = zero, sampleCount=two, mipMaps = 1):name outputTexture2DMS +//TEST_INPUT: RWTexture2D(format=RGBA8Sint, size=4, content = zero, sampleCount=two, mipMaps = 1):name outputTexture2DMS RWTexture2DMS outputTexture2DMS; -//TEST_INPUT: RWTexture2D(format=R8G8B8A8_SINT, size=4, content = zero, arrayLength=2, sampleCount=two, mipMaps = 1):name outputTexture2DMSArray +//TEST_INPUT: RWTexture2D(format=RGBA8Sint, size=4, content = zero, arrayLength=2, sampleCount=two, mipMaps = 1):name outputTexture2DMSArray RWTexture2DMSArray outputTexture2DMSArray; //TEST_INPUT:ubuffer(data=[0], stride=4):out,name=outputBuffer diff --git a/tests/compute/texture-subscript.slang b/tests/compute/texture-subscript.slang index efcc491e6..75a6e5738 100644 --- a/tests/compute/texture-subscript.slang +++ b/tests/compute/texture-subscript.slang @@ -8,16 +8,16 @@ //METAL-NOT: error 41402 //METALLIB: @computeMain -//TEST_INPUT: RWTexture1D(format=R8G8B8A8_SINT, size=8, content = zero, mipMaps = 1):name outputTexture1D +//TEST_INPUT: RWTexture1D(format=RGBA8Sint, size=8, content = zero, mipMaps = 1):name outputTexture1D RWTexture1D outputTexture1D; -//TEST_INPUT: RWTexture2D(format=R8G8B8A8_SINT, size=8, content = zero, mipMaps = 1):name outputTexture2D +//TEST_INPUT: RWTexture2D(format=RGBA8Sint, size=8, content = zero, mipMaps = 1):name outputTexture2D RWTexture2D outputTexture2D; -//TEST_INPUT: RWTexture3D(format=R8G8B8A8_SINT, size=8, content = zero, mipMaps = 1):name outputTexture3D +//TEST_INPUT: RWTexture3D(format=RGBA8Sint, size=8, content = zero, mipMaps = 1):name outputTexture3D RWTexture3D outputTexture3D; -//TEST_INPUT: RWTexture2D(format=R8G8B8A8_SINT, size=4, content = zero, arrayLength=2, mipMaps = 1):name outputTexture2DArray +//TEST_INPUT: RWTexture2D(format=RGBA8Sint, size=4, content = zero, arrayLength=2, mipMaps = 1):name outputTexture2DArray RWTexture2DArray outputTexture2DArray; //TEST_INPUT:ubuffer(data=[0], stride=4):out,name=outputBuffer -- cgit v1.2.3