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.
This commit is contained in:
Corentin Wallez
2017-05-29 11:30:29 -07:00
committed by Corentin Wallez
parent 26275d0a16
commit 583e9a8f3c
13 changed files with 71 additions and 87 deletions

View File

@@ -15,7 +15,6 @@
#include "Utils.h"
#include <bitset>
#include <unistd.h>
#define GLM_FORCE_DEPTH_ZERO_TO_ONE
#include <glm/mat4x4.hpp>
#include <glm/gtc/matrix_inverse.hpp>
@@ -450,9 +449,7 @@ namespace {
}
void init() {
nxtProcTable procs;
GetProcTableAndDevice(&procs, &device);
nxtSetProcs(&procs);
device = CreateCppNXTDevice();
queue = device.CreateQueueBuilder().GetResult();
@@ -575,7 +572,7 @@ namespace {
const auto& node = scene.nodes.at(n);
drawNode(node);
}
SwapBuffers();
DoSwapBuffers();
}
}
@@ -640,14 +637,14 @@ int main(int argc, const char* argv[]) {
init();
GLFWwindow* window = GetWindow();
GLFWwindow* window = GetGLFWWindow();
glfwSetMouseButtonCallback(window, mouseButtonCallback);
glfwSetCursorPosCallback(window, cursorPosCallback);
glfwSetScrollCallback(window, scrollCallback);
while (!ShouldQuit()) {
frame();
usleep(16000);
USleep(16000);
}
// TODO release stuff