Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Buildfixes

Browse Source
This commit is contained in:
Henrik Rydgård 2020-06-21 23:13:05 +02:00
parent fbc4fa5bca
commit 3d743a5ae7
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -396,6 +396,8 @@ set(CommonWindows
source_group(Windows FILES ${CommonWindows}) source_group(Windows FILES ${CommonWindows})
set(CommonVulkan ${CommonExtra} set(CommonVulkan ${CommonExtra}
Common/Vulkan/VulkanDebug.cpp
Common/Vulkan/VulkanDebug.h
Common/Vulkan/VulkanContext.cpp Common/Vulkan/VulkanContext.cpp
Common/Vulkan/VulkanContext.h Common/Vulkan/VulkanContext.h
Common/Vulkan/VulkanImage.cpp Common/Vulkan/VulkanImage.cpp

2
Common/Vulkan/VulkanDebug.cpp
View File

@ -23,7 +23,7 @@
#include "Common/Vulkan/VulkanContext.h" #include "Common/Vulkan/VulkanContext.h"
#include "Common/Vulkan/VulkanDebug.h" #include "Common/Vulkan/VulkanDebug.h"
VkBool32 VKAPI_CALL VulkanDebugUtilsCallback( VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDebugUtilsCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
VkDebugUtilsMessageTypeFlagsEXT messageType, VkDebugUtilsMessageTypeFlagsEXT messageType,
const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,

2
Common/Vulkan/VulkanDebug.h
View File

@ -25,4 +25,4 @@ struct VulkanLogOptions {
bool msgBoxOnError; bool msgBoxOnError;
}; };
VkBool32 VKAPI_CALL VulkanDebugUtilsCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData, void *pUserData); VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDebugUtilsCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData, void *pUserData);

1
SDL/SDLVulkanGraphicsContext.h
View File

@ -42,5 +42,4 @@ public:
private: private:
Draw::DrawContext *draw_ = nullptr; Draw::DrawContext *draw_ = nullptr;
VulkanContext *vulkan_ = nullptr; VulkanContext *vulkan_ = nullptr;
VulkanLogOptions g_LogOptions;
}; };

2
android/jni/AndroidVulkanContext.cpp
View File

@ -13,8 +13,6 @@
#include "Core/ConfigValues.h" #include "Core/ConfigValues.h"
#include "Core/System.h" #include "Core/System.h"
static VulkanLogOptions g_LogOptions;
AndroidVulkanContext::AndroidVulkanContext() {} AndroidVulkanContext::AndroidVulkanContext() {}
AndroidVulkanContext::~AndroidVulkanContext() { AndroidVulkanContext::~AndroidVulkanContext() {