commit 9f90c8d3cac95af44fab5ac54ea4cb10da823c53
author Corentin Wallez <cwallez@chromium.org> Thu Oct 24 23:55:37 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Oct 24 23:55:37 2019 +0000
tree 83c1ef3adaee68bd3b94e1e1b8b5fb73281df099
parent 1fdcb16b6995c54c645f17566d019ebf46229fd0

Make dawn_native public headers and dawn_wsi use webgpu.h

BUG=dawn:22

Change-Id: I112d71323c9305fa0997d251556fe0a41dafed29
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/12701
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

src/dawn_native/opengl/OpenGLBackend.cpp

diff --git a/src/dawn_native/opengl/OpenGLBackend.cpp b/src/dawn_native/opengl/OpenGLBackend.cpp
index 91b019f..fbab415 100644
--- a/src/dawn_native/opengl/OpenGLBackend.cpp
+++ b/src/dawn_native/opengl/OpenGLBackend.cpp
@@ -27,7 +27,7 @@
         : AdapterDiscoveryOptionsBase(BackendType::OpenGL) {
     }
 
-    DawnSwapChainImplementation CreateNativeSwapChainImpl(DawnDevice device,
+    DawnSwapChainImplementation CreateNativeSwapChainImpl(WGPUDevice device,
                                                           PresentCallback present,
                                                           void* presentUserdata) {
         Device* backendDevice = reinterpret_cast<Device*>(device);
@@ -35,15 +35,15 @@
         DawnSwapChainImplementation impl;
         impl = CreateSwapChainImplementation(
             new NativeSwapChainImpl(backendDevice, present, presentUserdata));
-        impl.textureUsage = DAWN_TEXTURE_USAGE_PRESENT;
+        impl.textureUsage = WGPUTextureUsage_Present;
 
         return impl;
     }
 
-    DawnTextureFormat GetNativeSwapChainPreferredFormat(
+    WGPUTextureFormat GetNativeSwapChainPreferredFormat(
         const DawnSwapChainImplementation* swapChain) {
         NativeSwapChainImpl* impl = reinterpret_cast<NativeSwapChainImpl*>(swapChain->userData);
-        return static_cast<DawnTextureFormat>(impl->GetPreferredFormat());
+        return static_cast<WGPUTextureFormat>(impl->GetPreferredFormat());
     }
 
 }}  // namespace dawn_native::opengl