iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

get rid of #define VK_NO_PROTOTYPES

Browse Source
This commit is contained in:
CocoSimone
2022-08-08 09:45:15 +02:00
parent 8a450e110b
commit 325ef2a66b
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/frontend/imgui/CMakeLists.txt
View File

@@ -16,6 +16,7 @@ target_include_directories(frontend-imgui PUBLIC
../../n64/core/cpu
../../n64/core/cpu/registers
../../../external
../../../external/parallel-rdp/parallel-rdp-standalone
../../../external/parallel-rdp/parallel-rdp-standalone/vulkan
../../../external/parallel-rdp/parallel-rdp-standalone/util
../../../external/parallel-rdp/parallel-rdp-standalone/volk)

10
src/frontend/imgui/Window.cpp
View File

@@ -2,16 +2,20 @@
#include <util.hpp>
#include <nfd.hpp>
#include <Core.hpp>
#include <parallel-rdp/parallel-rdp-standalone/volk/volk.h>
#include <parallel-rdp/ParallelRDPWrapper.hpp>
#include <utility>
Window::Window(const n64::Core& core) {
InitSDL();
InitParallelRDP(core.GetRDRAM());
InitParallelRDP(core.GetRDRAM(), window);
InitImgui();
}
[[nodiscard]] bool Window::gotClosed(SDL_Event event) {
return event.type == SDL_WINDOWEVENT
&& event.window.event == SDL_WINDOWEVENT_CLOSE
&& event.window.windowID == SDL_GetWindowID(window);
}
void Window::InitSDL() {
SDL_Init(SDL_INIT_EVERYTHING);
window = SDL_CreateWindow(

17
src/frontend/imgui/Window.hpp
View File

@@ -1,11 +1,11 @@
#pragma once
#include <parallel-rdp/ParallelRDPWrapper.hpp>
#include <volk.h>
#include <imgui.h>
#include <imgui_impl_sdl.h>
#define VK_NO_PROTOTYPES
#define VULKAN_DEBUG
#include <imgui_impl_vulkan.h>
#include <SDL2/SDL.h>
#include <SDL2/SDL_vulkan.h>
#include <vulkan/vulkan.h>
#include <SDL2/SDL_video.h>
#include <Core.hpp>
#include <vector>
@@ -14,19 +14,14 @@ struct Window {
~Window();
ImDrawData* Present();
[[nodiscard]] bool gotClosed(SDL_Event event) {
return event.type == SDL_WINDOWEVENT
&& event.window.event == SDL_WINDOWEVENT_CLOSE
&& event.window.windowID == SDL_GetWindowID(window);
}
[[nodiscard]] bool gotClosed(SDL_Event event);
private:
SDL_Window* window;
n64::Core core;
void InitSDL();
void InitImgui();
void Render();
SDL_Window* window{};
VkInstance instance{};
VkPhysicalDevice physicalDevice{};
VkDevice device{};