Update Metal GPU counters to support macOS 10.15 and build under Xcode 11.7.
diff --git a/MoltenVK/MoltenVK/Commands/MVKCommandBuffer.mm b/MoltenVK/MoltenVK/Commands/MVKCommandBuffer.mm
index bb67c78..d3a351c 100644
--- a/MoltenVK/MoltenVK/Commands/MVKCommandBuffer.mm
+++ b/MoltenVK/MoltenVK/Commands/MVKCommandBuffer.mm
@@ -771,6 +771,7 @@
}
}
+#if MVK_XCODE_12
// Metal stage GPU counters need to be configured in a Metal render, compute, or BLIT encoder, meaning that the
// Metal encoder needs to know about any Vulkan timestamp commands that will be executed during the execution
// of a renderpass, or set of Vulkan dispatch or BLIT commands. In addition, there are a very small number of
@@ -808,6 +809,9 @@
}
_timestampStageCounterQueries.clear();
}
+#else
+void MVKCommandEncoder::encodeTimestampStageCounterSamples() {}
+#endif
void MVKCommandEncoder::resetQueries(MVKQueryPool* pQueryPool, uint32_t firstQuery, uint32_t queryCount) {
addActivatedQueries(pQueryPool, firstQuery, queryCount);
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
index 809d9a4..7ef37f5 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -1601,10 +1601,21 @@
_metalFeatures.counterSamplingPoints |= MVK_COUNTER_SAMPLING_AT_ ##mvkSP; \
}
+#if MVK_XCODE_12
checkSupportsMTLCounterSamplingPoint(Draw, DRAW);
checkSupportsMTLCounterSamplingPoint(Dispatch, DISPATCH);
checkSupportsMTLCounterSamplingPoint(Blit, BLIT);
checkSupportsMTLCounterSamplingPoint(Stage, PIPELINE_STAGE);
+#endif
+
+#if !MVK_APPLE_SILICON
+ // On macOS, if we couldn't query supported sample points (on macOS 11),
+ // but the platform can support immediate-mode sample points, indicate that here.
+ if (!_metalFeatures.counterSamplingPoints && mvkOSVersionIsAtLeast(10.15)) { \
+ _metalFeatures.counterSamplingPoints = MVK_COUNTER_SAMPLING_AT_DRAW | MVK_COUNTER_SAMPLING_AT_DISPATCH | MVK_COUNTER_SAMPLING_AT_BLIT; \
+ }
+#endif
+
}
// Initializes the physical device features of this instance.
