mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-13 23:26:24 +00:00
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:
committed by
Corentin Wallez
parent
26275d0a16
commit
583e9a8f3c
@@ -14,7 +14,6 @@
|
||||
|
||||
#include "Utils.h"
|
||||
|
||||
#include <unistd.h>
|
||||
#include <vector>
|
||||
|
||||
nxt::Device device;
|
||||
@@ -183,9 +182,7 @@ void initPipelinePost() {
|
||||
}
|
||||
|
||||
void init() {
|
||||
nxtProcTable procs;
|
||||
GetProcTableAndDevice(&procs, &device);
|
||||
nxtSetProcs(&procs);
|
||||
device = CreateCppNXTDevice();
|
||||
|
||||
queue = device.CreateQueueBuilder().GetResult();
|
||||
|
||||
@@ -217,7 +214,7 @@ void frame() {
|
||||
.GetResult();
|
||||
|
||||
queue.Submit(1, &commands);
|
||||
SwapBuffers();
|
||||
DoSwapBuffers();
|
||||
}
|
||||
|
||||
int main(int argc, const char* argv[]) {
|
||||
@@ -228,7 +225,7 @@ int main(int argc, const char* argv[]) {
|
||||
|
||||
while (!ShouldQuit()) {
|
||||
frame();
|
||||
usleep(16000);
|
||||
USleep(16000);
|
||||
}
|
||||
|
||||
// TODO release stuff
|
||||
|
||||
Reference in New Issue
Block a user