From 76cfd1787fc3c214ddc4ef7acedfb795fc695917 Mon Sep 17 00:00:00 2001 From: Devon7925 Date: Tue, 3 Dec 2024 17:30:39 -0700 Subject: [PATCH] Drop float4 inference and adjust test --- source/slang/slang-check-decl.cpp | 3 --- tests/language-feature/spirv-asm/imageoperands-warning.slang | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp index 3a62dc1927..b5ea6b3e6d 100644 --- a/source/slang/slang-check-decl.cpp +++ b/source/slang/slang-check-decl.cpp @@ -1677,9 +1677,6 @@ ImageFormat inferImageFormatFromTextureType( case 2: format = ImageFormat::rg32f; break; - case 4: - format = ImageFormat::rgba32f; - break; } break; } diff --git a/tests/language-feature/spirv-asm/imageoperands-warning.slang b/tests/language-feature/spirv-asm/imageoperands-warning.slang index fd22e6ae48..cbde4144fa 100644 --- a/tests/language-feature/spirv-asm/imageoperands-warning.slang +++ b/tests/language-feature/spirv-asm/imageoperands-warning.slang @@ -10,7 +10,7 @@ RWStructuredBuffer outputBuffer; // CHECK-NEXT: 1 //TEST_INPUT: Texture2D(size=4, content = one):name t2D -Texture2D t2D; +Texture2D t2D; //TEST_INPUT: Sampler:name samplerState SamplerState samplerState; @@ -28,7 +28,7 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) float r = spirv_asm { // The type of our sampled image - %sampledImageType = OpTypeSampledImage $$Texture2D; + %sampledImageType = OpTypeSampledImage $$Texture2D; // Combine the image with the sampler %sampledImage : %sampledImageType = OpSampledImage $t2D $samplerState; // Perform a sample