commit 583e9a8f3cdf1a9d734b8a8bbcb8944f39cfd333
author Corentin Wallez <cwallez@chromium.org> Mon May 29 11:30:29 2017 -0700
committer Corentin Wallez <corentin@wallez.net> Tue May 30 10:48:32 2017 -0700
tree 9534f5a73bb0f509f4792416f703e46c4f703708
parent 26275d0a1632959dd378efe8db51cbe663289c5c

Avoid name conflicts between Util and Windows function

GetWindow and SwapBuffers are function of Windows.h and using the same
name causes a compile error.

This commit also changes Util's GetProcTableAndDevice to CreateNXTDevice
because we might need to call NXT procs when creating the C++ device.

examples/Utils.cpp

diff --git a/examples/Utils.cpp b/examples/Utils.cpp
index 4ab6f8b..9d344a1 100644
--- a/examples/Utils.cpp
+++ b/examples/Utils.cpp
@@ -25,6 +25,12 @@
 #include <sstream>
 #include <iomanip>
 
+#ifdef _WIN32
+    #include <Windows.h>
+#else
+    #include <unistd.h>
+#endif
+
 BackendBinding* CreateMetalBinding();
 
 namespace backend {
@@ -104,7 +110,7 @@
 static nxt::wire::TerribleCommandBuffer* c2sBuf = nullptr;
 static nxt::wire::TerribleCommandBuffer* s2cBuf = nullptr;
 
-void GetProcTableAndDevice(nxtProcTable* procs, nxt::Device* device) {
+nxt::Device CreateCppNXTDevice() {
     switch (backendType) {
         case BackendType::OpenGL:
             binding = new OpenGLBinding;
@@ -122,13 +128,13 @@
     }
 
     if (!glfwInit()) {
-        return;
+        return nxt::Device();
     }
 
     binding->SetupGLFWWindowHints();
     window = glfwCreateWindow(640, 480, "NXT window", nullptr, nullptr);
     if (!window) {
-        return;
+        return nxt::Device();
     }
 
     binding->SetWindow(window);
@@ -137,10 +143,12 @@
     nxtProcTable backendProcs;
     binding->GetProcAndDevice(&backendProcs, &backendDevice);
 
+    nxtDevice cDevice = nullptr;
+    nxtProcTable procs;
     switch (cmdBufType) {
         case CmdBufType::None:
-            *procs = backendProcs;
-            *device = nxt::Device::Acquire(backendDevice);
+            procs = backendProcs;
+            cDevice = backendDevice;
             break;
 
         case CmdBufType::Terrible:
@@ -156,13 +164,15 @@
                 wireClient = nxt::wire::NewClientDevice(&clientProcs, &clientDevice, c2sBuf);
                 s2cBuf->SetHandler(wireClient);
 
-                *procs = clientProcs;
-                *device = nxt::Device::Acquire(clientDevice);
+                procs = clientProcs;
+                cDevice = clientDevice;
             }
             break;
     }
 
-    procs->deviceSetErrorCallback(device->Get(), PrintDeviceError, 0);
+    nxtSetProcs(&procs);
+    procs.deviceSetErrorCallback(cDevice, PrintDeviceError, 0);
+    return nxt::Device::Acquire(cDevice);
 }
 
 nxt::ShaderModule CreateShaderModule(const nxt::Device& device, nxt::ShaderStage stage, const char* source) {
@@ -278,17 +288,15 @@
         return true;
     }
 
-    void GetProcTableAndDevice(nxtProcTable* procs, nxtDevice* device) {
-        nxt::Device cppDevice;
-        GetProcTableAndDevice(procs, &cppDevice);
-        *device = cppDevice.Release();
+    nxtDevice CreateNXTDevice() {
+        return CreateCppNXTDevice().Release();
     }
 
     nxtShaderModule CreateShaderModule(nxtDevice device, nxtShaderStage stage, const char* source) {
         return CreateShaderModule(device, static_cast<nxt::ShaderStage>(stage), source).Release();
     }
 
-    void SwapBuffers() {
+    void DoSwapBuffers() {
         if (cmdBufType == CmdBufType::Terrible) {
             c2sBuf->Flush();
             s2cBuf->Flush();
@@ -297,11 +305,21 @@
         binding->SwapBuffers();
     }
 
+#ifdef _WIN32
+    void USleep(uint64_t usecs) {
+        Sleep(usecs / 1000);
+    }
+#else
+    void USleep(uint64_t usecs) {
+        usleep(usecs);
+    }
+#endif
+
     bool ShouldQuit() {
         return glfwWindowShouldClose(window);
     }
 
-    GLFWwindow* GetWindow() {
+    GLFWwindow* GetGLFWWindow() {
         return window;
     }
 }