commit b92c3755602e582e9ac9a21c8e03aa5e778fb84f
author Austin Eng <enga@chromium.org> Thu Nov 26 13:55:55 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Nov 26 13:55:55 2020 +0000
tree a1e9e3102bdd7f251e612ea8b17c4584dbd6e7d9
parent 69afcb41e78505adc3005d1cf0f78ce31dc07eb0

Update DestroyTests to use WGSL

Bug: dawn:572
Change-Id: Ia4ffacad9740fc49aac4333a6e7a1a83a5002491
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/33762
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/tests/end2end/DestroyTests.cpp

diff --git a/src/tests/end2end/DestroyTests.cpp b/src/tests/end2end/DestroyTests.cpp
index dfa883f..37440f8 100644
--- a/src/tests/end2end/DestroyTests.cpp
+++ b/src/tests/end2end/DestroyTests.cpp
@@ -27,20 +27,17 @@
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 
-        wgpu::ShaderModule vsModule =
-            utils::CreateShaderModule(device, utils::SingleShaderStage::Vertex, R"(
-              #version 450
-              layout(location = 0) in vec4 pos;
-              void main() {
-                  gl_Position = pos;
+        wgpu::ShaderModule vsModule = utils::CreateShaderModuleFromWGSL(device, R"(
+              [[location(0)]] var<in> pos : vec4<f32>;
+              [[builtin(position)]] var<out> Position : vec4<f32>;
+              [[stage(vertex)]] fn main() -> void {
+                  Position = pos;
               })");
 
-        wgpu::ShaderModule fsModule =
-            utils::CreateShaderModule(device, utils::SingleShaderStage::Fragment, R"(
-              #version 450
-              layout(location = 0) out vec4 fragColor;
-              void main() {
-                  fragColor = vec4(0.0, 1.0, 0.0, 1.0);
+        wgpu::ShaderModule fsModule = utils::CreateShaderModuleFromWGSL(device, R"(
+              [[location(0)]] var<out> fragColor : vec4<f32>;
+              [[stage(fragment)]] fn main() -> void {
+                  fragColor = vec4<f32>(0.0, 1.0, 0.0, 1.0);
               })");
 
         utils::ComboRenderPipelineDescriptor descriptor(device);