Metal renderer fixes for iOS

include/config.hpp

@@ -55,6 +55,13 @@ struct EmulatorConfig {
 	static constexpr bool audioEnabledDefault = false;
 #endif
 
+	// We default to OpenGL on all platforms other than iOS
+#if defined(PANDA3DS_IOS)
+	static constexpr RendererType rendererDefault = RendererType::Metal;
+#else
+	static constexpr RendererType rendererDefault = RendererType::OpenGL;
+#endif
+
 	bool shaderJitEnabled = shaderJitDefault;
 	bool useUbershaders = ubershaderDefault;
 	bool accelerateShaders = accelerateShadersDefault;
@@ -65,7 +72,7 @@ struct EmulatorConfig {
 	bool forceShadergenForLights = true;
 	int lightShadergenThreshold = 1;
 
-	RendererType rendererType = RendererType::OpenGL;
+	RendererType rendererType = rendererDefault;
 	Audio::DSPCore::Type dspType = Audio::DSPCore::Type::HLE;
 
 	bool sdCardInserted = true;

src/config.cpp

@@ -72,14 +72,14 @@ void EmulatorConfig::load() {
 			auto gpu = gpuResult.unwrap();
 
 			// Get renderer
-			auto rendererName = toml::find_or<std::string>(gpu, "Renderer", "OpenGL");
+			auto rendererName = toml::find_or<std::string>(gpu, "Renderer", Renderer::typeToString(rendererDefault));
 			auto configRendererType = Renderer::typeFromString(rendererName);
 
 			if (configRendererType.has_value()) {
 				rendererType = configRendererType.value();
 			} else {
 				Helpers::warn("Invalid renderer specified: %s\n", rendererName.c_str());
-				rendererType = RendererType::OpenGL;
+				rendererType = rendererDefault;
 			}
 
 			shaderJitEnabled = toml::find_or<toml::boolean>(gpu, "EnableShaderJIT", shaderJitDefault);

src/host_shaders/metal_shaders.metal

@@ -1,4 +1,6 @@
 #include <metal_stdlib>
+#include <TargetConditionals.h>
+
 using namespace metal;
 
 struct BasicVertexOut {
@@ -219,12 +221,6 @@ struct Globals {
 	uint GPUREG_LIGHTING_LUTINPUT_SELECT;
 	uint GPUREG_LIGHTi_CONFIG;
 
-	// HACK
-	//bool lightingEnabled;
-    //uint8_t lightingNumLights;
-    //uint32_t lightingConfig1;
-    //uint16_t alphaControl;
-
     float3 normal;
 };
 
@@ -655,14 +651,15 @@ float4 performLogicOp(LogicOp logicOp, float4 s, float4 d) {
     return as_type<float4>(performLogicOpU(logicOp, as_type<uint4>(s), as_type<uint4>(d)));
 }
 
-fragment float4 fragmentDraw(DrawVertexOut in [[stage_in]], float4 prevColor [[color(0)]], constant PicaRegs& picaRegs [[buffer(0)]], constant FragTEV& tev [[buffer(1)]], constant LogicOp& logicOp [[buffer(2)]], constant uint2& lutSlices [[buffer(3)]], texture2d<float> tex0 [[texture(0)]], texture2d<float> tex1 [[texture(1)]], texture2d<float> tex2 [[texture(2)]], texture2d_array<float> texLightingLut [[texture(3)]], texture1d_array<float> texFogLut [[texture(4)]], sampler samplr0 [[sampler(0)]], sampler samplr1 [[sampler(1)]], sampler samplr2 [[sampler(2)]], sampler linearSampler [[sampler(3)]]) {
+// iOS simulator doesn't support fb fetch, so don't enable it
-    Globals globals;
+#ifndef TARGET_OS_SIMULATOR
+#define PREVIOUS_COLOR_DECL float4 prevColor [[color(0)]],
+#else
+#define PREVIOUS_COLOR_DECL
+#endif
 
-    // HACK
+fragment float4 fragmentDraw(DrawVertexOut in [[stage_in]], PREVIOUS_COLOR_DECL constant PicaRegs& picaRegs [[buffer(0)]], constant FragTEV& tev [[buffer(1)]], constant LogicOp& logicOp [[buffer(2)]], constant uint2& lutSlices [[buffer(3)]], texture2d<float> tex0 [[texture(0)]], texture2d<float> tex1 [[texture(1)]], texture2d<float> tex2 [[texture(2)]], texture2d_array<float> texLightingLut [[texture(3)]], texture1d_array<float> texFogLut [[texture(4)]], sampler samplr0 [[sampler(0)]], sampler samplr1 [[sampler(1)]], sampler samplr2 [[sampler(2)]], sampler linearSampler [[sampler(3)]]) {
-    //globals.lightingEnabled = picaRegs.read(0x008Fu) != 0u;
+    Globals globals;
-    //globals.lightingNumLights = picaRegs.read(0x01C2u);
-    //globals.lightingConfig1 = picaRegs.read(0x01C4u);
-    //globals.alphaControl = picaRegs.read(0x104);
 
     globals.tevSources[0] = in.color;
     if (lightingEnabled) {
@@ -755,5 +752,9 @@ fragment float4 fragmentDraw(DrawVertexOut in [[stage_in]], float4 prevColor [[c
 		}
 	}
 
+#ifndef TARGET_OS_SIMULATOR
 	return performLogicOp(logicOp, color, prevColor);
+#else
+	return performLogicOp(logicOp, color, float4(0.0));
+#endif
 }

src/ios_driver.mm

@@ -22,12 +22,8 @@ IOS_EXPORT void iosCreateEmulator() {
 	hidService = &emulator->getServiceManager().getHID();
 	emulator->initGraphicsContext(nullptr);
 
-	// auto path = emulator->getAppDataRoot() / "Kirb Demo.3ds";
+	auto path = emulator->getAppDataRoot() / "toon_shading.elf";
-	auto path = emulator->getAppDataRoot() / "Kirb Demo.3ds";
-
-	//auto path = emulator->getAppDataRoot() / "toon_shading.elf";
 	emulator->loadROM(path);
-	printf("Created emulator\n");
 }
 
 IOS_EXPORT void iosRunFrame(CAMetalLayer* layer) {