From 4247bd295aa210a3cf1b4ccb57d58b1fed2505f6 Mon Sep 17 00:00:00 2001 From: BodgeMaster <> Date: Fri, 27 Jan 2023 01:04:18 +0100 Subject: [PATCH] fossvg (client): Commit to using Vulkan I have decided that we are going to use Vulkan for this. Hopefully, it works out. This commit removes some OpenGL-specific things and adds Vulkan to the build command line. --- scripts/build.sh | 2 +- src/fossvg.cpp | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index c0fff03..bc483ca 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -63,7 +63,7 @@ COMPILE_COMMANDS=( "$CXX_WITH_FLAGS src/tools/arraydump.cpp -I./include -Lbin/lib -l:file.so -l:cli.so -o bin/tools/arraydump" "$CXX_WITH_FLAGS src/tools/baseconvert.cpp -I./include -Lbin/lib -l:cli.so -o bin/tools/baseconvert" "$CXX_WITH_FLAGS -pthread src/tools/hexnet.cpp -I./include -Lbin/lib -l:cli.so -l:libsockpp.so -o bin/tools/hexnet" - "$CXX_WITH_FLAGS src/fossvg.cpp -I./include -Lbin/lib -l:cli.so -lglfw -o bin/fossvg" + "$CXX_WITH_FLAGS -DFOSSVG_DEBUG src/fossvg.cpp -I./include -Lbin/lib -l:cli.so -lglfw -lvulkan -o bin/fossvg" "$CXX_WITH_FLAGS src/fossvgd.cpp -I./include -Lbin/lib -l:cli.so -o bin/fossvgd" ) for command in ${!COMPILE_COMMANDS[@]}; do diff --git a/src/fossvg.cpp b/src/fossvg.cpp index 8380b8c..66c587d 100644 --- a/src/fossvg.cpp +++ b/src/fossvg.cpp @@ -113,9 +113,6 @@ int main(int argc, char* argv[]) { return EXIT_RUNTIME; } - // What dis do? It was in a tutorial. - glfwMakeContextCurrent(window); - glfwSetCursorPosCallback(window, cursorPositionCallback); glfwSetKeyCallback(window, keyCallback); glfwSetCharCallback(window, textInputCallback); @@ -124,9 +121,6 @@ int main(int argc, char* argv[]) { glfwSetScrollCallback(window, scrollCallback); while (!glfwWindowShouldClose(window)) { - - glfwSwapBuffers(window); - glfwPollEvents(); }