Drop float4 inference and adjust test

shader-slang · Dec 4, 2024 · 76cfd17 · 76cfd17
1 parent e60236d
commit 76cfd17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -10,7 +10,7 @@ RWStructuredBuffer<int> outputBuffer;
 // CHECK-NEXT: 1
 
 //TEST_INPUT: Texture2D(size=4, content = one):name t2D
-Texture2D<float> 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<float>;
+        %sampledImageType = OpTypeSampledImage $$Texture2D;
         // Combine the image with the sampler
         %sampledImage : %sampledImageType = OpSampledImage $t2D $samplerState;
         // Perform a sample
-Original file line number
+Diff line change
@@ Expand Up / @@ -1677,9 +1677,6 @@ ImageFormat inferImageFormatFromTextureType( @@
                     case 2:
                         format = ImageFormat::rg32f;
                         break;
-                    case 4:
-                        format = ImageFormat::rgba32f;
-                        break;
                     }
                     break;
                 }
@@ Expand Down @@