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

@@ -17,7 +17,6 @@
#include <array>
#include <cstring>
#include <random>
#include <unistd.h>
#include <glm/glm.hpp>
@@ -296,9 +295,7 @@ void initCommandBuffers() {
}
void init() {
nxtProcTable procs;
GetProcTableAndDevice(&procs, &device);
nxtSetProcs(&procs);
device = CreateCppNXTDevice();
queue = device.CreateQueueBuilder().GetResult();
@@ -310,7 +307,7 @@ void init() {
void frame() {
queue.Submit(1, &commandBuffers[pingpong]);
SwapBuffers();
DoSwapBuffers();
pingpong = (pingpong + 1) % 2;
}
@@ -323,7 +320,7 @@ int main(int argc, const char* argv[]) {
while (!ShouldQuit()) {
frame();
usleep(16000);
USleep(16000);
}
// TODO release stuff