Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final 1.2 fixes

Browse Source
This commit is contained in:
sean 2022-09-26 18:11:33 +02:00 committed by Bill Hollings
parent ac39eb24e1
commit e8b32dec92
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.h
View File

@ -94,7 +94,7 @@ public:
/** Returns whether this binding has a variable descriptor count. */
inline bool hasVariableDescriptorCount() const {
return mvkIsAnyFlagEnabled(_flags, VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT);
return mvkIsAnyFlagEnabled(_flags, VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT);
}
/**

2
MoltenVK/MoltenVK/GPUObjects/MVKDescriptorSet.mm
View File

@ -809,7 +809,7 @@ void MVKDescriptorPool::initMetalArgumentBuffer(const VkDescriptorPoolCreateInfo
if (metalArgBuffSize) {
NSUInteger maxMTLBuffSize = _device->_pMetalFeatures->maxMTLBufferSize;
if (metalArgBuffSize > maxMTLBuffSize) {
setConfigurationResult(reportError(VK_ERROR_FRAGMENTATION_EXT, "vkCreateDescriptorPool(): The requested descriptor storage of %d MB is larger than the maximum descriptor storage of %d MB per VkDescriptorPool.", (uint32_t)(metalArgBuffSize / MEBI), (uint32_t)(maxMTLBuffSize / MEBI)));
setConfigurationResult(reportError(VK_ERROR_FRAGMENTATION, "vkCreateDescriptorPool(): The requested descriptor storage of %d MB is larger than the maximum descriptor storage of %d MB per VkDescriptorPool.", (uint32_t)(metalArgBuffSize / MEBI), (uint32_t)(maxMTLBuffSize / MEBI)));
metalArgBuffSize = maxMTLBuffSize;
}
_metalArgumentBuffer = [getMTLDevice() newBufferWithLength: metalArgBuffSize options: MTLResourceStorageModeShared]; // retained

4
MoltenVK/MoltenVK/Vulkan/vulkan.mm
View File

@ -2454,7 +2454,7 @@ MVK_PUBLIC_VULKAN_SYMBOL void vkResetQueryPool(
MVK_PUBLIC_VULKAN_SYMBOL VkResult vkSignalSemaphore(
VkDevice device,
const VkSemaphoreSignalInfoKHR* pSignalInfo) {
const VkSemaphoreSignalInfo* pSignalInfo) {
MVKTraceVulkanCallStart();
auto* mvkSem4 = (MVKTimelineSemaphore*)pSignalInfo->semaphore;
@ -2465,7 +2465,7 @@ MVK_PUBLIC_VULKAN_SYMBOL VkResult vkSignalSemaphore(
MVK_PUBLIC_VULKAN_SYMBOL VkResult vkWaitSemaphores(
VkDevice device,
const VkSemaphoreWaitInfoKHR* pWaitInfo,
const VkSemaphoreWaitInfo* pWaitInfo,
uint64_t timeout) {
MVKTraceVulkanCallStart();