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

Merge pull request #1272 from billhollings/cts-descset-crash

Browse Source 
Report accurate value for VkPhysicalDeviceLimits::maxBoundDescriptorSets.
This commit is contained in:
Bill Hollings 2021-02-18 17:44:54 -05:00 committed by GitHub
commit ef64dc4654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Docs/Whats_New.md
View File

@ -16,7 +16,7 @@ Copyright (c) 2015-2021 [The Brenwill Workshop Ltd.](http://www.brenwill.com)
MoltenVK 1.1.2 MoltenVK 1.1.2
-------------- --------------
Released TBD Released 2021/02/22
- Advertise support for `shaderInt64` feature. - Advertise support for `shaderInt64` feature.
- Support fast math on MSL compiler via `MVKConfiguration::fastMathEnabled` configuration - Support fast math on MSL compiler via `MVKConfiguration::fastMathEnabled` configuration
@ -25,6 +25,7 @@ Released TBD
- `vkGetMoltenVKConfigurationMVK()` and `vkSetMoltenVKConfigurationMVK()` functions - `vkGetMoltenVKConfigurationMVK()` and `vkSetMoltenVKConfigurationMVK()` functions
can now be used with a `VkInstance` from another Vulkan layer, or with a `VK_NULL_HANDLE VkInstance`. can now be used with a `VkInstance` from another Vulkan layer, or with a `VK_NULL_HANDLE VkInstance`.
- `MVKConfiguration` extended to cover all MoltenVK environment variables. - `MVKConfiguration` extended to cover all MoltenVK environment variables.
- Report accurate value of 8 for `VkPhysicalDeviceLimits::maxBoundDescriptorSets`.
- Add ability to automatically capture first GPU frame by setting `MVKConfiguration::autoGPUCaptureScope` - Add ability to automatically capture first GPU frame by setting `MVKConfiguration::autoGPUCaptureScope`
(or environment variable `MVK_CONFIG_AUTO_GPU_CAPTURE_SCOPE`) to `2`. (or environment variable `MVK_CONFIG_AUTO_GPU_CAPTURE_SCOPE`) to `2`.
- Remove official support for submitting shaders directly containing MSL source code or compiled MSL code. - Remove official support for submitting shaders directly containing MSL source code or compiled MSL code.

1
MoltenVK/MoltenVK/GPUObjects/MVKDevice.h
View File

@ -80,6 +80,7 @@ const static uint32_t kMVKMinSwapchainImageCount = 2;
const static uint32_t kMVKMaxSwapchainImageCount = 3; const static uint32_t kMVKMaxSwapchainImageCount = 3;
const static uint32_t kMVKCachedViewportScissorCount = 16; const static uint32_t kMVKCachedViewportScissorCount = 16;
const static uint32_t kMVKCachedColorAttachmentCount = 8; const static uint32_t kMVKCachedColorAttachmentCount = 8;
const static uint32_t kMVKMaxDescriptorSetCount = SPIRV_CROSS_NAMESPACE::kMaxArgumentBuffers;
#pragma mark - #pragma mark -

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

@ -2053,7 +2053,7 @@ void MVKPhysicalDevice::initLimits() {
_properties.limits.maxMemoryAllocationCount = kMVKUndefinedLargeUInt32; _properties.limits.maxMemoryAllocationCount = kMVKUndefinedLargeUInt32;
_properties.limits.maxSamplerAllocationCount = kMVKUndefinedLargeUInt32; _properties.limits.maxSamplerAllocationCount = kMVKUndefinedLargeUInt32;
_properties.limits.maxBoundDescriptorSets = kMVKUndefinedLargeUInt32; _properties.limits.maxBoundDescriptorSets = kMVKMaxDescriptorSetCount;
_properties.limits.maxComputeWorkGroupCount[0] = kMVKUndefinedLargeUInt32; _properties.limits.maxComputeWorkGroupCount[0] = kMVKUndefinedLargeUInt32;
_properties.limits.maxComputeWorkGroupCount[1] = kMVKUndefinedLargeUInt32; _properties.limits.maxComputeWorkGroupCount[1] = kMVKUndefinedLargeUInt32;