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

11
external/parallel-rdp/ParallelRDPWrapper.cpp vendored
View File

@@ -71,7 +71,7 @@ public:
const char* extensions[64];
unsigned int num_extensions = 64;
if (!SDL_Vulkan_GetInstanceExtensions(window, &num_extensions, extensions)) {
if (!SDL_Vulkan_GetInstanceExtensions(g_Window, &num_extensions, extensions)) {
util::panic("SDL_Vulkan_GetInstanceExtensions failed: %s", SDL_GetError());
}
auto vec = std::vector<const char*>();
@@ -85,8 +85,8 @@ public:
VkSurfaceKHR create_surface(VkInstance instance, VkPhysicalDevice gpu) override {
VkSurfaceKHR vk_surface;
if (!SDL_Vulkan_CreateSurface(window, instance, &vk_surface)) {
util::panic("Failed to create Vulkan window surface: %s", SDL_GetError());
if (!SDL_Vulkan_CreateSurface(g_Window, instance, &vk_surface)) {
util::panic("Failed to create Vulkan window surface: {}", SDL_GetError());
}
return vk_surface;
}
@@ -165,7 +165,8 @@ void LoadParallelRDP(const u8* rdram) {
}
}
void InitParallelRDP(const u8* rdram) {
void InitParallelRDP(const u8* rdram, SDL_Window* window) {
g_Window = window;
LoadWSIPlatform(new SDLWSIPlatform(), std::make_unique<SDLParallelRdpWindowInfo>());
LoadParallelRDP(rdram);
}
@@ -183,7 +184,7 @@ void DrawFullscreenTexturedQuad(Util::IntrusivePtr<Image> image, Util::Intrusive
*data++ = +1.0f;
int sdlWinWidth, sdlWinHeight;
SDL_GetWindowSize(window, &sdlWinWidth, &sdlWinHeight);
SDL_GetWindowSize(g_Window, &sdlWinWidth, &sdlWinHeight);
float zoom = std::min(
(float)sdlWinWidth / wsi->get_platform().get_surface_width(),

6
external/parallel-rdp/ParallelRDPWrapper.hpp vendored
View File

@@ -5,7 +5,7 @@
#include <core/mmio/VI.hpp>
struct Window;
static SDL_Window* window;
static SDL_Window* g_Window;
class ParallelRdpWindowInfo {
public:
@@ -20,7 +20,7 @@ public:
class SDLParallelRdpWindowInfo : public ParallelRdpWindowInfo {
CoordinatePair get_window_size() {
int width, height;
SDL_GetWindowSize(window, &width, &height);
SDL_GetWindowSize(g_Window, &width, &height);
return CoordinatePair{ width, height };
}
};
@@ -34,7 +34,7 @@ uint32_t GetVkGraphicsQueueFamily();
VkFormat GetVkFormat();
VkCommandBuffer GetVkCommandBuffer();
void SubmitRequestedVkCommandBuffer();
void InitParallelRDP(const u8* rdram);
void InitParallelRDP(const u8* rdram, SDL_Window*);
void UpdateScreenParallelRdp(Window& imguiWindow, const n64::VI& vi);
void ParallelRdpEnqueueCommand(int command_length, u32* buffer);
void ParallelRdpOnFullSync();