commit 225479f0a5f2050a8199d4533ceb2c58acd6f41f
author James Price <jrprice@google.com> Wed Jul 19 00:45:24 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 19 00:45:24 2023 +0000
tree f9d80e4a7a10728c50756c9884a134dac18d1470
parent c6223a1b5d2955ef99528ba3ebcebe40b8741cdd

[ir][spirv-writer] Fix texture builtin return type

Some tests were using a scalar f32 result instead of a vector.

Bug: tint:1906
Change-Id: I6693e054de57e0478bcd17969e8d85c2dfbc127a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/141441
Auto-Submit: James Price <jrprice@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: James Price <jrprice@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

src/tint/ir/transform/builtin_polyfill_spirv_test.cc

diff --git a/src/tint/ir/transform/builtin_polyfill_spirv_test.cc b/src/tint/ir/transform/builtin_polyfill_spirv_test.cc
index 6f655c4..9d2c8e2 100644
--- a/src/tint/ir/transform/builtin_polyfill_spirv_test.cc
+++ b/src/tint/ir/transform/builtin_polyfill_spirv_test.cc
@@ -309,14 +309,14 @@
     func->SetParams({t, s, coords});
 
     b.With(func->Block(), [&] {
-        auto* result = b.Call(ty.f32(), builtin::Function::kTextureSample, t, s, coords);
+        auto* result = b.Call(ty.vec4<f32>(), builtin::Function::kTextureSample, t, s, coords);
         b.Return(func, result);
     });
 
     auto* src = R"(
 %foo = func(%t:texture_2d<f32>, %s:sampler, %coords:vec2<f32>):vec4<f32> -> %b1 {
   %b1 = block {
-    %5:f32 = textureSample %t, %s, %coords
+    %5:vec4<f32> = textureSample %t, %s, %coords
     ret %5
   }
 }
@@ -431,14 +431,15 @@
     func->SetParams({t, s, coords, bias});
 
     b.With(func->Block(), [&] {
-        auto* result = b.Call(ty.f32(), builtin::Function::kTextureSampleBias, t, s, coords, bias);
+        auto* result =
+            b.Call(ty.vec4<f32>(), builtin::Function::kTextureSampleBias, t, s, coords, bias);
         b.Return(func, result);
     });
 
     auto* src = R"(
 %foo = func(%t:texture_2d<f32>, %s:sampler, %coords:vec2<f32>, %bias:f32):vec4<f32> -> %b1 {
   %b1 = block {
-    %6:f32 = textureSampleBias %t, %s, %coords, %bias
+    %6:vec4<f32> = textureSampleBias %t, %s, %coords, %bias
     ret %6
   }
 }
@@ -801,14 +802,14 @@
 
     b.With(func->Block(), [&] {
         auto* result =
-            b.Call(ty.f32(), builtin::Function::kTextureSampleBias, t, s, coords, ddx, ddy);
+            b.Call(ty.vec4<f32>(), builtin::Function::kTextureSampleBias, t, s, coords, ddx, ddy);
         b.Return(func, result);
     });
 
     auto* src = R"(
 %foo = func(%t:texture_2d<f32>, %s:sampler, %coords:vec2<f32>, %ddx:vec2<f32>, %ddy:vec2<f32>):vec4<f32> -> %b1 {
   %b1 = block {
-    %7:f32 = textureSampleBias %t, %s, %coords, %ddx, %ddy
+    %7:vec4<f32> = textureSampleBias %t, %s, %coords, %ddx, %ddy
     ret %7
   }
 }
@@ -928,14 +929,15 @@
     func->SetParams({t, s, coords, lod});
 
     b.With(func->Block(), [&] {
-        auto* result = b.Call(ty.f32(), builtin::Function::kTextureSampleLevel, t, s, coords, lod);
+        auto* result =
+            b.Call(ty.vec4<f32>(), builtin::Function::kTextureSampleLevel, t, s, coords, lod);
         b.Return(func, result);
     });
 
     auto* src = R"(
 %foo = func(%t:texture_2d<f32>, %s:sampler, %coords:vec2<f32>, %lod:f32):vec4<f32> -> %b1 {
   %b1 = block {
-    %6:f32 = textureSampleLevel %t, %s, %coords, %lod
+    %6:vec4<f32> = textureSampleLevel %t, %s, %coords, %lod
     ret %6
   }
 }