Index: README.txt =================================================================== --- README.txt (revision 86a820ea6ce565432dbb16d8d70e72d8557a5bda) +++ README.txt (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) @@ -57,2 +57,8 @@ -sudo apt-get install libxcb1-dev xorg-dev libsdl2-dev libglm-dev + +OSX + +Download the vulkan sdk + +Theoretically, installing sdl using "brew install sdl2 --HEAD" should give me the one with VUlkan support Index: game-gui-sdl.cpp =================================================================== --- game-gui-sdl.cpp (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) +++ game-gui-sdl.cpp (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) @@ -0,0 +1,23 @@ +#include "game-gui-sdl.hpp" + +#include + +#include + +using namespace std; + +bool GameGui_SDL::Init() { + // may want to define SDL_INIT_NOPARACHUTE when I start handling crashes since it + // prevents SDL from setting up its own handlers for SIG_SEGV and stuff like that + + // If this function fails, I can call SDL_GetError() for more info + // I should create a generic error retrieval function, similar to SDL_GetError() + + // cout << "SDL could not initialize! SDL_Error: " << SDL_GetError() << endl; + + return SDL_Init(SDL_INIT_EVERYTHING) < 0 ? RTWO_ERROR : RTWO_SUCCESS; +} + +void GameGui_SDL::Shutdown() { + SDL_Quit(); +} Index: game-gui-sdl.hpp =================================================================== --- game-gui-sdl.hpp (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) +++ game-gui-sdl.hpp (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) @@ -0,0 +1,10 @@ +//#include "game-gui.hpp" + +#define RTWO_SUCCESS true +#define RTWO_ERROR false + +class GameGui_SDL { + public: + bool Init(); + void Shutdown(); +}; Index: game-gui.hpp =================================================================== --- game-gui.hpp (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) +++ game-gui.hpp (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) @@ -0,0 +1,5 @@ +class GameGui { + public: + virtual void Init(); + virtual void Shutdown(); +}; Index: vulkan-makefile =================================================================== --- vulkan-makefile (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) +++ vulkan-makefile (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) @@ -0,0 +1,17 @@ +VULKAN_SDK_PATH = /Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0 +CC = g++ + +# Add -DNDEBUG in prod builds to turn off debugging +CXX_FLAGS = -O3 -std=c++11 + +CXX_INCLUDES = -I/Users/dportnoy15/Development/vulkan-sdk-macos-1.1.108.0/macOS/include -I/usr/local/Cellar/sdl2/2.0.9_1/include/SDL2 + +# -Wl,-rpath is required to link vulkan dynamically +# Check if I can do it statically, like in Linux +LIBFLAGS = -Wl,-rpath,$(VULKAN_SDK_PATH)/macOS/lib $(VULKAN_SDK_PATH)/macOS/lib/libvulkan.dylib -L/usr/local/Cellar/sdl2/2.0.9_1/lib -lSDL2 + +vulkan-hello-world: main.cpp game-gui-sdl.cpp + $(CC) $(CXX_FLAGS) $^ -o $@ $(CXX_INCLUDES) $(LIBFLAGS) + +clean: + rm -f vulkan-hello-world Index: vulkan-tutorial.cpp =================================================================== --- vulkan-tutorial.cpp (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) +++ vulkan-tutorial.cpp (revision f898c5ffd3d3b37cf9e8d865eb1e9d553e06b4e7) @@ -0,0 +1,203 @@ +#include + +#include +#include + +#define GLM_FORCE_RADIANS +#define GLM_FORCE_DEPTH_ZERO_TO_ONE +#include +#include + +#include +#include +#include +//#include +#include + +#include "game-gui-sdl.hpp" + +using namespace std; +using namespace glm; + +const int SCREEN_WIDTH = 800; +const int SCREEN_HEIGHT = 600; + +const vector validationLayers = { + "VK_LAYER_KHRONOS_validation" +}; + +#ifdef NDEBUG + const bool enableValidationLayers = false; +#else + const bool enableValidationLayers = true; +#endif + +class VulkanGame { + public: + void run() { + if (initWindow() == RTWO_ERROR) { + return; + } + initVulkan(); + createInstance(); + mainLoop(); + cleanup(); + } + private: + GameGui_SDL gui; + SDL_Window* window = NULL; + + VkInstance instance; + + // both SDL and GLFW create window functions return NULL on failure + bool initWindow() { + if (gui.Init() == RTWO_ERROR) { + cout << "UI library could not be initialized!" << endl; + return RTWO_ERROR; + } else { + // On Apple's OS X you must set the NSHighResolutionCapable Info.plist property to YES, + // otherwise you will not receive a High DPI OpenGL canvas. + + // TODO: Move this into some generic method in game-gui-sdl + window = SDL_CreateWindow("Vulkan Game", + SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, + SCREEN_WIDTH, SCREEN_HEIGHT, + SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN); + + if (window == NULL) { + cout << "Window could not be created!" << endl; + return RTWO_ERROR; + } else { + return RTWO_SUCCESS; + } + } + } + + void initVulkan() { + createInstance(); + } + + void createInstance() { + VkApplicationInfo appInfo = {}; + appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; + appInfo.pApplicationName = "Vulkan Game"; + appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0); + appInfo.pEngineName = "No Engine"; + appInfo.engineVersion = VK_MAKE_VERSION(1, 0, 0); + appInfo.apiVersion = VK_API_VERSION_1_0; + + VkInstanceCreateInfo createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + createInfo.pApplicationInfo = &appInfo; + + uint32_t extensionCount; + SDL_Vulkan_GetInstanceExtensions(window, &extensionCount, nullptr); + + vector extensionNames(extensionCount); + SDL_Vulkan_GetInstanceExtensions(window, &extensionCount, extensionNames.data()); + + createInfo.enabledExtensionCount = extensionCount; + createInfo.ppEnabledExtensionNames = extensionNames.data(); + createInfo.enabledLayerCount = 0; + + if (vkCreateInstance(&createInfo, nullptr, &instance) != VK_SUCCESS) { + throw runtime_error("failed to create instance!"); + } + } + + void mainLoop() { + // TODO: Create some generic event-handling functions in game-gui-* + SDL_Event e; + bool quit = false; + + while(!quit) { + while (SDL_PollEvent(&e)) { + if (e.type == SDL_QUIT) { + quit = true; + } + if (e.type == SDL_KEYDOWN) { + quit = true; + } + if (e.type == SDL_MOUSEBUTTONDOWN) { + quit = true; + } + } + } + } + + void cleanup() { + vkDestroyInstance(instance, nullptr); + + // TODO: Move this into some generic method in game-gui-sdl + SDL_DestroyWindow(window); + + gui.Shutdown(); + } +}; + +int main() { + +#ifdef NDEBUG + cout << "DEBUGGING IS OFF" << endl; +#else + cout << "DEBUGGING IS ON" << endl; +#endif + + /* + glfwInit(); + + glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); + GLFWwindow* window = glfwCreateWindow(800, 600, "Vulkan window", nullptr, nullptr); + + uint32_t extensionCount = 0; + vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr); + + cout << extensionCount << " extensions supported" << endl; + */ + + /* + while(!glfwWindowShouldClose(window)) { + glfwPollEvents(); + } + + glfwDestroyWindow(window); + + glfwTerminate(); + */ + + /* + mat4 matrix; + vec4 vec; + vec4 test = matrix * vec; + */ + + cout << "Starting Vulkan game..." << endl; + + VulkanGame game; + + try { + game.run(); + } catch (const exception& e) { + cerr << e.what() << endl; + return EXIT_FAILURE; + } + + /* Some code used to create a surface and draw on it using SDL + (Check that this works with a Vulkan window) + + VkSurfaceKHR surface; + if (!SDL_Vulkan_CreateSurface(window, instance, &surface)) { + cout << "Couild not create Vulkan surface" << endl; + } + + screenSurface = SDL_GetWindowSurface(window); + + SDL_FillRect(screenSurface, NULL, SDL_MapRGB(screenSurface->format, 0xFF, 0xFF, 0xFF)); + + SDL_UpdateWindowSurface(window); + */ + + cout << "Finished running the game" << endl; + + return EXIT_SUCCESS; +}