Merge pull request #1520 from billhollings/simulator-gpu-counter-sets
Fix use of GPU counter sets on older versions of iOS running on the simulator.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
index 61e5744..faad534 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -1639,10 +1639,10 @@
checkSupportsMTLCounterSamplingPoint(Stage, PIPELINE_STAGE);
#endif
-#if !MVK_APPLE_SILICON
+#if MVK_MACOS
// 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)) { \
+ if (!_metalFeatures.counterSamplingPoints && mvkOSVersionIsAtLeast(10.15) && !supportsMTLGPUFamily(Apple1)) { \
_metalFeatures.counterSamplingPoints = MVK_COUNTER_SAMPLING_AT_DRAW | MVK_COUNTER_SAMPLING_AT_DISPATCH | MVK_COUNTER_SAMPLING_AT_BLIT; \
}
#endif
