commit 241cd0cd8e68041b6f10322ade11c6209519ba46
author Austin Eng <enga@chromium.org> Tue Dec 22 19:24:28 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Dec 22 19:24:28 2020 +0000
tree 800ce6a707922d75571990fcce437f1c6046aed6
parent 58ce2745cd7077c8f38839f4c2f5beeebf631648

Update PrimitiveTopologyTests to use WGSL

Bug: dawn:572
Change-Id: I9275ad78e6222b33372f5640b07801b815670fa6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/33774
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

src/tests/end2end/PrimitiveTopologyTests.cpp

diff --git a/src/tests/end2end/PrimitiveTopologyTests.cpp b/src/tests/end2end/PrimitiveTopologyTests.cpp
index 2766a4e..be3e9e9 100644
--- a/src/tests/end2end/PrimitiveTopologyTests.cpp
+++ b/src/tests/end2end/PrimitiveTopologyTests.cpp
@@ -156,20 +156,18 @@
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 
-        vsModule = utils::CreateShaderModule(device, utils::SingleShaderStage::Vertex, R"(
-                #version 450
-                layout(location = 0) in vec4 pos;
-                void main() {
-                    gl_Position = pos;
-                    gl_PointSize = 1.0;
-                })");
+        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;
+            })");
 
-        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);
-                })");
+        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);
+            })");
 
         vertexBuffer = utils::CreateBufferFromData(device, kVertices, sizeof(kVertices),
                                                    wgpu::BufferUsage::Vertex);