commit | cd9dc36d2e4ed8b52558fbcf0555b3216934bb23 | [log] [tgz] |
---|---|---|
author | Ben Clayton <bclayton@google.com> | Wed Jan 13 20:29:08 2021 +0000 |
committer | Commit Bot service account <commit-bot@chromium.org> | Wed Jan 13 20:29:08 2021 +0000 |
tree | 470885a3af056f0031bf1ac8de043ccf98842739 | |
parent | 4607aa4c7541574f567404bb2affb09b4a448daa [diff] [blame] |
[wgsl]: s/texture_sampled_/texture_ These texture types were renamed in October 2020: https://github.com/gpuweb/gpuweb/pull/1180 Tint has supported both forms since November 2020: https://dawn-review.googlesource.com/c/tint/+/31380 Finally migrate to the new form so we can drop support for the old. Bug: tint:286 Change-Id: Id19b79be28152b3de163f9cce75eefff1ae31d76 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/37702 Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/examples/CppHelloTriangle.cpp b/examples/CppHelloTriangle.cpp index dc66746..08fd4c5 100644 --- a/examples/CppHelloTriangle.cpp +++ b/examples/CppHelloTriangle.cpp
@@ -106,7 +106,7 @@ wgpu::ShaderModule fsModule = utils::CreateShaderModuleFromWGSL(device, R"( [[builtin(frag_coord)]] var<in> FragCoord : vec4<f32>; [[set(0), binding(0)]] var<uniform_constant> mySampler: sampler; - [[set(0), binding(1)]] var<uniform_constant> myTexture : texture_sampled_2d<f32>; + [[set(0), binding(1)]] var<uniform_constant> myTexture : texture_2d<f32>; [[location(0)]] var<out> FragColor : vec4<f32>; [[stage(fragment)]] fn main() -> void {