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 --- tools/render-test/shader-input-layout.cpp | 68 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'tools/render-test/shader-input-layout.cpp') diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp index 25bfb58cf..ab9ed3c7b 100644 --- a/tools/render-test/shader-input-layout.cpp +++ b/tools/render-test/shader-input-layout.cpp @@ -30,7 +30,7 @@ Format _getFormatFromName(const UnownedStringSlice& slice) return Format(i); } } - return Format::Unknown; + return Format::Undefined; } struct TypeInfo @@ -150,7 +150,7 @@ struct ShaderInputLayoutParser { val->textureDesc.format = parseFormatOption(parser); - if (val->textureDesc.format == Format::Unknown) + if (val->textureDesc.format == Format::Undefined) { return SLANG_FAIL; } @@ -1294,14 +1294,14 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) switch (desc.format) { - case Format::R8G8B8A8_UNORM: + case Format::RGBA8Unorm: { generateTextureDataRGB8(output, desc); break; } - case Format::R16_FLOAT: - case Format::R16G16_FLOAT: - case Format::R16G16B16A16_FLOAT: + case Format::R16Float: + case Format::RG16Float: + case Format::RGBA16Float: { generateTextureDataWithTargetTStorage( output, @@ -1310,7 +1310,7 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoHalf); break; } - case Format::R64_UINT: + case Format::R64Uint: { generateTextureDataWithTargetTStorage( output, @@ -1319,11 +1319,11 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoUint); break; } - case Format::R32_FLOAT: - case Format::R32G32_FLOAT: - case Format::R32G32B32_FLOAT: - case Format::R32G32B32A32_FLOAT: - case Format::D32_FLOAT: + case Format::R32Float: + case Format::RG32Float: + case Format::RGB32Float: + case Format::RGBA32Float: + case Format::D32Float: { generateTextureDataWithTargetTStorage( output, @@ -1332,10 +1332,10 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoFloat); break; } - case Format::R32_UINT: - case Format::R32G32_UINT: - case Format::R32G32B32_UINT: - case Format::R32G32B32A32_UINT: + case Format::R32Uint: + case Format::RG32Uint: + case Format::RGB32Uint: + case Format::RGBA32Uint: { generateTextureDataWithTargetTStorage( output, @@ -1344,9 +1344,9 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoUint); break; } - case Format::R16_UINT: - case Format::R16G16_UINT: - case Format::R16G16B16A16_UINT: + case Format::R16Uint: + case Format::RG16Uint: + case Format::RGBA16Uint: { generateTextureDataWithTargetTStorage( output, @@ -1355,9 +1355,9 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoUint); break; } - case Format::R8_UINT: - case Format::R8G8_UINT: - case Format::R8G8B8A8_UINT: + case Format::R8Uint: + case Format::RG8Uint: + case Format::RGBA8Uint: { generateTextureDataWithTargetTStorage( output, @@ -1366,7 +1366,7 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoUint); break; } - case Format::R64_SINT: + case Format::R64Sint: { generateTextureDataWithTargetTStorage( output, @@ -1375,10 +1375,10 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoInt); break; } - case Format::R32_SINT: - case Format::R32G32_SINT: - case Format::R32G32B32_SINT: - case Format::R32G32B32A32_SINT: + case Format::R32Sint: + case Format::RG32Sint: + case Format::RGB32Sint: + case Format::RGBA32Sint: { generateTextureDataWithTargetTStorage( output, @@ -1387,9 +1387,9 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoInt); break; } - case Format::R16_SINT: - case Format::R16G16_SINT: - case Format::R16G16B16A16_SINT: + case Format::R16Sint: + case Format::RG16Sint: + case Format::RGBA16Sint: { generateTextureDataWithTargetTStorage( output, @@ -1398,9 +1398,9 @@ void generateTextureData(TextureData& output, const InputTextureDesc& desc) loadDataIntoInt); break; } - case Format::R8_SINT: - case Format::R8G8_SINT: - case Format::R8G8B8A8_SINT: + case Format::R8Sint: + case Format::RG8Sint: + case Format::RGBA8Sint: { generateTextureDataWithTargetTStorage( output, @@ -1440,7 +1440,7 @@ void generateTextureDataRGB8(TextureData& output, const InputTextureDesc& inputD if (arrLen == 0) arrLen = 1; - output.init(Format::R8G8B8A8_UNORM); + output.init(Format::RGBA8Unorm); enum class SimpleScalarType { -- cgit v1.2.3