Move USleep to utils/

This commit is contained in:
Corentin Wallez
2017-07-17 17:13:57 -04:00
committed by Corentin Wallez
parent 2fbda87caf
commit 134e08005a
19 changed files with 94 additions and 37 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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);
}

View File

@@ -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();

View File

@@ -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