Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

libretro: Restore Vulkan MSAA video option

Browse source
This commit is contained in:
Nukem 2025-01-10 16:13:16 -05:00
parent aa752ade6c
commit d3aeff861e
5 changed files with 67 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Common/GPU/Vulkan/VulkanContext.cpp
View file

@ -174,13 +174,9 @@ VkResult VulkanContext::CreateInstance(const CreateInfo &info) {
}
}
// Temporary hack for libretro. For some reason, when we try to load the functions from this extension,
// we get null pointers when running libretro. Quite strange.
#if !defined(__LIBRETRO__)
if (EnableInstanceExtension(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_API_VERSION_1_1)) {
extensionsLookup_.KHR_get_physical_device_properties2 = true;
}
#endif
if (EnableInstanceExtension(VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME, 0)) {
extensionsLookup_.EXT_swapchain_colorspace = true;

2
libretro/LibretroVulkanContext.cpp
View file

@ -83,7 +83,7 @@ static const VkApplicationInfo *GetApplicationInfo(void) {
app_info.applicationVersion = Version(PPSSPP_GIT_VERSION).ToInteger();
app_info.pEngineName = "PPSSPP";
app_info.engineVersion = 2;
app_info.apiVersion = VK_API_VERSION_1_0;
app_info.apiVersion = VK_API_VERSION_1_3;
return &app_info;
}

6
libretro/libretro.cpp
View file

@ -700,7 +700,6 @@ static void check_variables(CoreParameter &coreParam)
g_Config.iInternalResolution = 1;
}
#if 0 // see issue #16786
var.key = "ppsspp_mulitsample_level";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
@ -715,7 +714,6 @@ static void check_variables(CoreParameter &coreParam)
else if (!strcmp(var.value, "x8"))
g_Config.iMultiSampleLevel = 3;
}
#endif
var.key = "ppsspp_cropto16x9";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@ -1143,7 +1141,6 @@ static void check_variables(CoreParameter &coreParam)
gpu->NotifyDisplayResized();
}
#if 0 // see issue #16786
if (g_Config.iMultiSampleLevel != iMultiSampleLevel_prev && PSP_IsInited())
{
if (gpu)
@ -1151,7 +1148,6 @@ static void check_variables(CoreParameter &coreParam)
gpu->NotifyRenderResized();
}
}
#endif
if (updateAvInfo)
{
@ -1488,10 +1484,8 @@ bool retro_load_game(const struct retro_game_info *game)
// Show/hide 'MSAA' and 'Texture Shader' options, Vulkan only
option_display.visible = (g_Config.iGPUBackend == (int)GPUBackend::VULKAN);
#if 0 // see issue #16786
option_display.key = "ppsspp_mulitsample_level";
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);
#endif
option_display.key = "ppsspp_texture_shader";
environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display);

6
libretro/libretro_core_options.h
View file

@ -326,12 +326,11 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"480x272"
},
#if 0 // see issue #16786
{
"ppsspp_mulitsample_level",
"MSAA Antialiasing (Vulkan Only)",
NULL,
"MSAA Antialiasing",
NULL,
"Vulkan only. Core restart required.",
NULL,
"video",
{
@ -343,7 +342,6 @@ struct retro_core_option_v2_definition option_defs_us[] = {
},
"Disabled"
},
#endif
{
"ppsspp_cropto16x9",
"Crop to 16x9",

98
libretro/libretro_vulkan.cpp
View file

@ -1,11 +1,3 @@
// Debugging notes
// The crash happens when we try to call vkGetPhysicalDeviceProperties2KHR which seems to be null.
//
// Apparently we don't manage to specify the extensions we want. Still something reports that this one
// is present?
// Failed to load : vkGetPhysicalDeviceProperties2KHR
// Failed to load : vkGetPhysicalDeviceFeatures2KHR
#include <cstring>
#include <cassert>
#include <vector>
@ -80,41 +72,79 @@ static VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance_libretro(const VkInstance
}
static void add_name_unique(std::vector<const char *> &list, const char *value) {
for (const char *name : list)
if (!strcmp(value, name))
return;
for (const char *name : list) {
if (!strcmp(value, name))
return;
}
list.push_back(value);
list.push_back(value);
}
static VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice_libretro(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) {
VkDeviceCreateInfo info = *pCreateInfo;
std::vector<const char *> EnabledLayerNames(info.ppEnabledLayerNames, info.ppEnabledLayerNames + info.enabledLayerCount);
std::vector<const char *> EnabledExtensionNames(info.ppEnabledExtensionNames, info.ppEnabledExtensionNames + info.enabledExtensionCount);
VkPhysicalDeviceFeatures EnabledFeatures = *info.pEnabledFeatures;
VkDeviceCreateInfo newInfo = *pCreateInfo;
for (unsigned i = 0; i < vk_init_info.num_required_device_layers; i++)
add_name_unique(EnabledLayerNames, vk_init_info.required_device_layers[i]);
// Add our custom layers
std::vector<const char *> enabledLayerNames(pCreateInfo->ppEnabledLayerNames, pCreateInfo->ppEnabledLayerNames + pCreateInfo->enabledLayerCount);
for (unsigned i = 0; i < vk_init_info.num_required_device_extensions; i++)
add_name_unique(EnabledExtensionNames, vk_init_info.required_device_extensions[i]);
for (uint32_t i = 0; i < vk_init_info.num_required_device_layers; i++) {
add_name_unique(enabledLayerNames, vk_init_info.required_device_layers[i]);
}
for (unsigned i = 0; i < sizeof(VkPhysicalDeviceFeatures) / sizeof(VkBool32); i++) {
if (((VkBool32 *)vk_init_info.required_features)[i])
((VkBool32 *)&EnabledFeatures)[i] = VK_TRUE;
}
newInfo.enabledLayerCount = (uint32_t)enabledLayerNames.size();
newInfo.ppEnabledLayerNames = newInfo.enabledLayerCount ? enabledLayerNames.data() : nullptr;
for (auto extension_name : EnabledExtensionNames) {
if (!strcmp(extension_name, VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME))
DEDICATED_ALLOCATION = true;
}
// Add our custom extensions
std::vector<const char *> enabledExtensionNames(pCreateInfo->ppEnabledExtensionNames, pCreateInfo->ppEnabledExtensionNames + pCreateInfo->enabledExtensionCount);
info.enabledLayerCount = (uint32_t)EnabledLayerNames.size();
info.ppEnabledLayerNames = info.enabledLayerCount ? EnabledLayerNames.data() : nullptr;
info.enabledExtensionCount = (uint32_t)EnabledExtensionNames.size();
info.ppEnabledExtensionNames = info.enabledExtensionCount ? EnabledExtensionNames.data() : nullptr;
info.pEnabledFeatures = &EnabledFeatures;
for (uint32_t i = 0; i < vk_init_info.num_required_device_extensions; i++) {
add_name_unique(enabledExtensionNames, vk_init_info.required_device_extensions[i]);
}
return vkCreateDevice_org(physicalDevice, &info, pAllocator, pDevice);
for (const char *extensionName : enabledExtensionNames) {
if (!strcmp(extensionName, VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME))
DEDICATED_ALLOCATION = true;
}
newInfo.enabledExtensionCount = (uint32_t)enabledExtensionNames.size();
newInfo.ppEnabledExtensionNames = newInfo.enabledExtensionCount ? enabledExtensionNames.data() : nullptr;
// Then check for VkPhysicalDeviceFeatures2 chaining or pEnabledFeatures to enable required features. Note that when both
// structs are present Features2 takes precedence. vkCreateDevice parameters don't give us a simple way to detect
// VK_KHR_get_physical_device_properties2 usage so we'll always try both paths.
std::unordered_map<VkPhysicalDeviceFeatures *, VkPhysicalDeviceFeatures> originalFeaturePointers;
VkPhysicalDeviceFeatures placeholderEnabledFeatures{};
for (const VkBaseOutStructure *next = (const VkBaseOutStructure *)pCreateInfo->pNext; next != nullptr;) {
if (next->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2) {
VkPhysicalDeviceFeatures *enabledFeatures = &((VkPhysicalDeviceFeatures2 *)next)->features;
originalFeaturePointers.try_emplace(enabledFeatures, *enabledFeatures);
}
next = (const VkBaseOutStructure *)next->pNext;
}
if (newInfo.pEnabledFeatures) {
placeholderEnabledFeatures = *newInfo.pEnabledFeatures;
}
newInfo.pEnabledFeatures = &placeholderEnabledFeatures;
originalFeaturePointers.try_emplace((VkPhysicalDeviceFeatures *)newInfo.pEnabledFeatures, *newInfo.pEnabledFeatures);
for (const auto& pair : originalFeaturePointers) {
for (uint32_t i = 0; i < sizeof(VkPhysicalDeviceFeatures) / sizeof(VkBool32); i++) {
if (((VkBool32 *)vk_init_info.required_features)[i])
((VkBool32 *)pair.first)[i] = VK_TRUE;
}
}
VkResult res = vkCreateDevice_org(physicalDevice, &newInfo, pAllocator, pDevice);
// The above code potentially modifies application memory. Restore it to avoid unexpected side effects.
for (const auto& pair : originalFeaturePointers) {
*pair.first = pair.second;
}
return res;
}
static VKAPI_ATTR VkResult VKAPI_CALL vkCreateLibretroSurfaceKHR(VkInstance instance, const void *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) {