Merge from master and fix PR conflicts.

This commit is contained in:
Bill Hollings 2021-05-05 16:46:45 -04:00
commit 19f02fac3d
2 changed files with 2 additions and 1 deletions

View File

@ -25,6 +25,7 @@ Released TBD
- Improve cache hits when matching `SPIRVToMSLConversionConfiguration` structs to each other
to find a cached shader, by only considering resources from the current shader stage.
- Rename `kMVKShaderStageMax` to `kMVKShaderStageCount`.
- Fix crash when requesting `MTLCommandBuffer` logs in runtime debug mode on older OS versions.
- Protect against crash when retrieving `MTLTexture` when `VkImage` has no `VkDeviceMemory` bound.
- Fix internal reference from `SPIRV_CROSS_NAMESPACE_OVERRIDE` to `SPIRV_CROSS_NAMESPACE`.

View File

@ -361,7 +361,7 @@ void MVKQueueCommandBufferSubmission::commitActiveMTLCommandBuffer(bool signalCo
#endif
}
#if MVK_XCODE_12
if (mvkConfig().debugMode) {
if (mvkConfig().debugMode && [mtlCB respondsToSelector: @selector(logs)]) {
bool isFirstMsg = true;
for (id<MTLFunctionLog> log in mtlCB.logs) {
if (isFirstMsg) {