commit 45b51f5df785069594fea29d59b76a0559d3a4e1
author Corentin Wallez <cwallez@chromium.org> Mon Oct 28 22:15:47 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Oct 28 22:15:47 2019 +0000
tree cf4483759b670fc73ceb316ba669cefd77ce7e52
parent cab352c2f6793f22ff0ea6f2717ff9039cbfc0c4

Make unittests and fuzzers use webgpu.h

BUG=dawn:22

Change-Id: Iff5465ad7a9456f9c6b2ee380af748b3afc129b7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/12741
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>

src/tests/unittests/wire/WireInjectTextureTests.cpp

diff --git a/src/tests/unittests/wire/WireInjectTextureTests.cpp b/src/tests/unittests/wire/WireInjectTextureTests.cpp
index d5dea81..9e327cf 100644
--- a/src/tests/unittests/wire/WireInjectTextureTests.cpp
+++ b/src/tests/unittests/wire/WireInjectTextureTests.cpp
@@ -32,12 +32,12 @@
 TEST_F(WireInjectTextureTests, CallAfterReserveInject) {
     ReservedTexture reservation = GetWireClient()->ReserveTexture(device);
 
-    DawnTexture apiTexture = api.GetNewTexture();
+    WGPUTexture apiTexture = api.GetNewTexture();
     EXPECT_CALL(api, TextureReference(apiTexture));
     ASSERT_TRUE(GetWireServer()->InjectTexture(apiTexture, reservation.id, reservation.generation));
 
-    dawnTextureCreateView(reservation.texture, nullptr);
-    DawnTextureView apiDummyView = api.GetNewTextureView();
+    wgpuTextureCreateView(reservation.texture, nullptr);
+    WGPUTextureView apiDummyView = api.GetNewTextureView();
     EXPECT_CALL(api, TextureCreateView(apiTexture, nullptr)).WillOnce(Return(apiDummyView));
     FlushClient();
 }
@@ -55,7 +55,7 @@
 TEST_F(WireInjectTextureTests, InjectExistingID) {
     ReservedTexture reservation = GetWireClient()->ReserveTexture(device);
 
-    DawnTexture apiTexture = api.GetNewTexture();
+    WGPUTexture apiTexture = api.GetNewTexture();
     EXPECT_CALL(api, TextureReference(apiTexture));
     ASSERT_TRUE(GetWireServer()->InjectTexture(apiTexture, reservation.id, reservation.generation));
 
@@ -69,12 +69,12 @@
     ReservedTexture reservation = GetWireClient()->ReserveTexture(device);
 
     // Injecting the texture adds a reference
-    DawnTexture apiTexture = api.GetNewTexture();
+    WGPUTexture apiTexture = api.GetNewTexture();
     EXPECT_CALL(api, TextureReference(apiTexture));
     ASSERT_TRUE(GetWireServer()->InjectTexture(apiTexture, reservation.id, reservation.generation));
 
     // Releasing the texture removes a single reference.
-    dawnTextureRelease(reservation.texture);
+    wgpuTextureRelease(reservation.texture);
     EXPECT_CALL(api, TextureRelease(apiTexture));
     FlushClient();