ppsspp: bump SA+LR to v1.20.2, default RK3566 to Vulkan backend #2406
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -413,6 +413,7 @@ | ||
| # NEON optimizations in libpng17 seem to cause PNG load errors, see #14485. | ||
| add_compile_definitions(PNG_ARM_NEON_OPT=0) | ||
|
|
||
| + add_compile_options(-Ofast -fno-tree-slp-vectorize) | ||
| add_compile_options(-Wall -Werror=return-type -Wno-unused-function -Wno-sign-compare -Wno-unused-but-set-variable "$<$<COMPILE_LANGUAGE:CXX>:-Wno-reorder>" -Wno-unknown-pragmas -Wno-unused-value -Wno-unused-variable -Wno-error=incompatible-pointer-types) | ||
| if(NOT CLANG) | ||
| # This one is very useful but has many false positives. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -414,6 +414,7 @@ | ||
| add_compile_definitions(PNG_ARM_NEON_OPT=0) | ||
|
|
||
| add_compile_options(-Ofast -fno-tree-slp-vectorize) | ||
| + add_compile_options(-mno-outline-atomics) | ||
| add_compile_options(-Wall -Werror=return-type -Wno-unused-function -Wno-sign-compare -Wno-unused-but-set-variable "$<$<COMPILE_LANGUAGE:CXX>:-Wno-reorder>" -Wno-unknown-pragmas -Wno-unused-value -Wno-unused-variable -Wno-error=incompatible-pointer-types) | ||
| if(NOT CLANG) | ||
| # This one is very useful but has many false positives. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| --- a/libretro/libretro_vulkan.cpp | ||
| +++ b/libretro/libretro_vulkan.cpp | ||
| @@ -109,27 +109,34 @@ static VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice_libretro(VkPhysicalDevice p | ||
| 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. | ||
| + // Check for VkPhysicalDeviceFeatures2 in pNext chain. Per Vulkan spec, pEnabledFeatures | ||
| + // must be NULL when VkPhysicalDeviceFeatures2 is present in pNext. | ||
| std::unordered_map<VkPhysicalDeviceFeatures *, VkPhysicalDeviceFeatures> originalFeaturePointers; | ||
| VkPhysicalDeviceFeatures placeholderEnabledFeatures{}; | ||
| + bool hasFeatures2InChain = false; | ||
|
|
||
| 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); | ||
| + hasFeatures2InChain = true; | ||
| } | ||
|
|
||
| next = (const VkBaseOutStructure *)next->pNext; | ||
| } | ||
|
|
||
| - if (newInfo.pEnabledFeatures) { | ||
| - placeholderEnabledFeatures = *newInfo.pEnabledFeatures; | ||
| - } | ||
| + if (!hasFeatures2InChain) { | ||
| + // Only use pEnabledFeatures when VkPhysicalDeviceFeatures2 is NOT in pNext chain. | ||
| + if (newInfo.pEnabledFeatures) { | ||
| + placeholderEnabledFeatures = *newInfo.pEnabledFeatures; | ||
| + } | ||
|
|
||
| - newInfo.pEnabledFeatures = &placeholderEnabledFeatures; | ||
| - originalFeaturePointers.try_emplace((VkPhysicalDeviceFeatures *)newInfo.pEnabledFeatures, *newInfo.pEnabledFeatures); | ||
| + newInfo.pEnabledFeatures = &placeholderEnabledFeatures; | ||
| + originalFeaturePointers.try_emplace((VkPhysicalDeviceFeatures *)newInfo.pEnabledFeatures, *newInfo.pEnabledFeatures); | ||
| + } else { | ||
| + // Ensure pEnabledFeatures is NULL when features2 is used (Vulkan spec requirement). | ||
| + newInfo.pEnabledFeatures = nullptr; | ||
| + } | ||
|
|
||
| for (const auto& pair : originalFeaturePointers) { | ||
| for (uint32_t i = 0; i < sizeof(VkPhysicalDeviceFeatures) / sizeof(VkBool32); i++) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3 seems to aggressive as a default with vulkan