Move USleep to utils/

examples/Animometer.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <cstdlib>
 #include <cstdio>
@@ -163,7 +164,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/CHelloTriangle.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 nxtDevice device;
 nxtQueue queue;
@@ -104,7 +105,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/ComputeBoids.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <array>
 #include <cstring>
@@ -312,7 +313,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/HelloCompute.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <string.h>
 
@@ -156,7 +157,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/HelloDepthStencil.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <vector>
 #include <glm/glm/glm.hpp>
@@ -305,7 +306,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/HelloIndices.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <vector>
 
@@ -104,7 +105,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/HelloInstancing.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <vector>
 
@@ -110,7 +111,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/HelloTriangle.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <vector>
 
@@ -166,7 +167,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/HelloUBO.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 nxt::Device device;
 nxt::Queue queue;
@@ -115,7 +116,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/HelloVertices.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <vector>
 
@@ -97,7 +98,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/RenderToTexture.cpp

@@ -15,6 +15,7 @@
 #include "SampleUtils.h"
 
 #include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <vector>
 
@@ -214,7 +215,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

examples/SampleUtils.cpp

@@ -16,15 +16,6 @@
 #include "utils/BackendBinding.h"
 #include "wire/TerribleCommandBuffer.h"
 
-// Include Windows.h before GLFW to avoid a redefinition of APIENTRY
-#if defined(NXT_PLATFORM_WINDOWS)
-    #include <Windows.h>
-#elif defined(NXT_PLATFORM_POSIX)
-   #include <unistd.h>
-#else
-    #error "Unsupported platform."
-#endif
-
 #include <nxt/nxt.h>
 #include <nxt/nxtcpp.h>
 #include "GLFW/glfw3.h"
@@ -179,18 +170,6 @@ void DoSwapBuffers() {
     binding->SwapBuffers();
 }
 
-#if defined(NXT_PLATFORM_WINDOWS)
-    void USleep(uint64_t usecs) {
-        Sleep(static_cast<DWORD>(usecs / 1000));
-    }
-#elif defined(NXT_PLATFORM_POSIX)
-    void USleep(uint64_t usecs) {
-        usleep(usecs);
-    }
-#else
-    #error "Implement USleep for your platform."
-#endif
-
 bool ShouldQuit() {
     return glfwWindowShouldClose(window);
 }

examples/SampleUtils.h

@@ -17,7 +17,6 @@
 bool InitSample(int argc, const char** argv);
 void DoSwapBuffers();
 bool ShouldQuit();
-void USleep(uint64_t usecs);
 
 struct GLFWwindow;
 struct GLFWwindow* GetGLFWWindow();

examples/glTFViewer/glTFViewer.cpp

@@ -20,9 +20,10 @@
 
 #include "SampleUtils.h"
 
-#include "utils/NXTHelpers.h"
 #include "common/Math.h"
 #include "common/Constants.h"
+#include "utils/NXTHelpers.h"
+#include "utils/SystemUtils.h"
 
 #include <bitset>
 #define GLM_FORCE_DEPTH_ZERO_TO_ONE
@@ -662,7 +663,7 @@ int main(int argc, const char* argv[]) {
 
     while (!ShouldQuit()) {
         frame();
-        USleep(16000);
+        utils::USleep(16000);
     }
 
     // TODO release stuff

src/tests/NXTTest.cpp

@@ -18,6 +18,7 @@
 #include "common/Constants.h"
 #include "common/Math.h"
 #include "utils/BackendBinding.h"
+#include "utils/SystemUtils.h"
 
 #include "GLFW/glfw3.h"
 
@@ -195,6 +196,11 @@ void NXTTest::AddTextureExpectation(const char* file, int line, const nxt::Textu
     deferredExpectations.push_back(deferred);
 }
 
+void NXTTest::WaitABit() {
+    device.Tick();
+    utils::USleep(100);
+}
+
 void NXTTest::SwapBuffers() {
     binding->SwapBuffers();
 }
@@ -233,9 +239,8 @@ void NXTTest::MapSlotsSynchronously() {
     }
 
     // Busy wait until all map operations are done.
-    // TODO(cwallez@chromium.org): usleep a bit?
     while (numPendingMapOperations != 0) {
-        device.Tick();
+        WaitABit();
     }
 }
 

src/tests/NXTTest.h

@@ -63,6 +63,7 @@ class NXTTest : public ::testing::TestWithParam<BackendType> {
 
         void SetUp() override;
         void TearDown() override;
+
         bool IsD3D12() const;
 
     protected:
@@ -73,6 +74,7 @@ class NXTTest : public ::testing::TestWithParam<BackendType> {
         void AddBufferExpectation(const char* file, int line, const nxt::Buffer& buffer, uint32_t offset, uint32_t size, detail::Expectation* expectation);
         void AddTextureExpectation(const char* file, int line, const nxt::Texture& texture, uint32_t x, uint32_t y, uint32_t width, uint32_t height, uint32_t pixelSize, detail::Expectation* expectation);
 
+        void WaitABit();
         void SwapBuffers();
 
     private:

src/utils/CMakeLists.txt

@@ -19,6 +19,8 @@ list(APPEND UTILS_SOURCES
     ${UTILS_DIR}/BackendBinding.h
     ${UTILS_DIR}/NXTHelpers.cpp
     ${UTILS_DIR}/NXTHelpers.h
+    ${UTILS_DIR}/SystemUtils.cpp
+    ${UTILS_DIR}/SystemUtils.h
 )
 
 if (NXT_ENABLE_D3D12)

src/utils/SystemUtils.cpp

@@ -0,0 +1,39 @@
+// Copyright 2017 The NXT Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "common/Platform.h"
+
+#if defined(NXT_PLATFORM_WINDOWS)
+    #include <Windows.h>
+#elif defined(NXT_PLATFORM_POSIX)
+   #include <unistd.h>
+#else
+    #error "Unsupported platform."
+#endif
+
+namespace utils {
+
+    #if defined(NXT_PLATFORM_WINDOWS)
+        void USleep(int usecs) {
+            Sleep(static_cast<DWORD>(usecs / 1000));
+        }
+    #elif defined(NXT_PLATFORM_POSIX)
+        void USleep(int usecs) {
+            usleep(usecs);
+        }
+    #else
+        #error "Implement USleep for your platform."
+    #endif
+
+}

src/utils/SystemUtils.h

@@ -0,0 +1,19 @@
+// Copyright 2017 The NXT Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace utils {
+
+    void USleep(int usecs);
+
+}