commit 0bc3be3707331fd73b251138b5143a6dd42ae2a6
author Bill Hollings <bill.hollings@brenwill.com> Mon Aug 12 23:55:56 2019 -0400
committer GitHub <noreply@github.com> Mon Aug 12 23:55:56 2019 -0400
tree fe456f4bb68bb73dd2fafb4af1467b17c020bcd7
parent 95f5b58145957c7f57bececc75dbf660a2057742
parent 95e805c8c2ba683610d8898662a6a3d46634d8e0

Merge pull request #718 from billhollings/master

vkCmdBlitImage() fix test for different sample counts.

MoltenVK/MoltenVK/Commands/MVKCmdTransfer.mm

diff --git a/MoltenVK/MoltenVK/Commands/MVKCmdTransfer.mm b/MoltenVK/MoltenVK/Commands/MVKCmdTransfer.mm
index df846e8..a18ecd1 100644
--- a/MoltenVK/MoltenVK/Commands/MVKCmdTransfer.mm
+++ b/MoltenVK/MoltenVK/Commands/MVKCmdTransfer.mm
@@ -77,9 +77,10 @@
 	_isDstCompressed = _dstImage->getIsCompressed();
 	uint32_t dstBytesPerBlock = mvkMTLPixelFormatBytesPerBlock(_dstMTLPixFmt);
 
-	_canCopyFormats = formatsMustMatch
-						? (_dstMTLPixFmt == _srcMTLPixFmt)
-						: ((dstBytesPerBlock == srcBytesPerBlock) && (_dstSampleCount == _srcSampleCount));
+	_canCopyFormats = (_dstSampleCount == _srcSampleCount) && (formatsMustMatch
+																? (_dstMTLPixFmt == _srcMTLPixFmt)
+																: (dstBytesPerBlock == srcBytesPerBlock));
+
 	_useTempBuffer = (_srcMTLPixFmt != _dstMTLPixFmt) && (_isSrcCompressed || _isDstCompressed);	// Different formats and at least one is compressed
 
 	_commandUse = commandUse;