commit 92336c597a99e8c04d7fcf1e97dc2cc5fe0ce1c3
author Bill Hollings <bill.hollings@brenwill.com> Wed Sep 23 15:34:01 2020 -0400
committer GitHub <noreply@github.com> Wed Sep 23 15:34:01 2020 -0400
tree eb8e158fba037b8212a84826b3df425e1e5f7b93
parent f58da7675cce2187386959d85adb4b78ac77fd4b
parent 4097089f1c0b4bbd41753e8583317a851d0445d7

Merge pull request #1067 from billhollings/setmtltex

vkSetMTLTextureMVK() Fix crash if incoming MTLTexture does not have an IOSurface.

Docs/Whats_New.md

diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
index 001246a..e3b5c03 100644
--- a/Docs/Whats_New.md
+++ b/Docs/Whats_New.md
@@ -56,6 +56,7 @@
   frameworks into a single `MoltenVKShaderConverter` framework.
 - Fix Metal validation error when occlusion query and renderpass are in separate 
   Vulkan command buffers.
+- `vkSetMTLTextureMVK()` Fix crash if incoming `MTLTexture` does not have an associated `IOSurface`. 
 
 
 

MoltenVK/MoltenVK/GPUObjects/MVKImage.mm

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
index 7db5dfd..eda24a3 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
@@ -698,7 +698,7 @@
 
 	if (_device->_pMetalFeatures->ioSurfaces) {
 		_ioSurface = mtlTexture.iosurface;
-		CFRetain(_ioSurface);
+		if (_ioSurface) { CFRetain(_ioSurface); }
 	}
 
 	return VK_SUCCESS;