More iOS progress

include/ios_driver.h

@@ -1,3 +1,4 @@
 #pragma once
 
 void iosCreateEmulator();
+void iosRunFrame(void* drawable, void* drawableTexture);

include/renderer.hpp

@@ -86,6 +86,10 @@ class Renderer {
 	// Called to notify the core to use OpenGL ES and not desktop GL
 	virtual void setupGLES() {}
 
+	// Only relevant for Metal renderer on iOS
+	// Passes a SwiftUI MTKView Drawable & its texture to the renderer
+	virtual void setMTKDrawable(void* drawable, void* drawableTexture) {};
+
 	// This function is called on every draw call before parsing vertex data.
 	// It is responsible for things like looking up which vertex/fragment shaders to use, recompiling them if they don't exist, choosing between
 	// ubershaders and shadergen, and so on.

include/renderer_mtl/renderer_mtl.hpp

@@ -42,11 +42,16 @@ class RendererMTL final : public Renderer {
 	virtual void initGraphicsContext([[maybe_unused]] GL::Context* context) override {}
 #endif
 
-  private:
+	virtual void setMTKDrawable(void* drawable, void* drawableTexture) override;
-	CA::MetalLayer* metalLayer;
 
-	MTL::Device* device;
+  private:
-	MTL::CommandQueue* commandQueue;
+	CA::MetalLayer* metalLayer = nullptr;
+
+	CA::MetalDrawable* metalDrawable = nullptr;
+	MTL::Texture* drawableTexture = nullptr;
+
+	MTL::Device* device = nullptr;
+	MTL::CommandQueue* commandQueue = nullptr;
 
 	Metal::CommandEncoder commandEncoder;
 

src/core/renderer_mtl/renderer_mtl.cpp

@@ -30,7 +30,6 @@ PICA::ColorFmt ToColorFormat(u32 format) {
 }
 
 MTL::Library* loadLibrary(MTL::Device* device, const cmrc::file& shaderSource) {
-	// MTL::CompileOptions* compileOptions = MTL::CompileOptions::alloc()->init();
 	NS::Error* error = nullptr;
 	MTL::Library* library = device->newLibrary(Metal::createDispatchData(shaderSource.begin(), shaderSource.size()), &error);
 	// MTL::Library* library = device->newLibrary(NS::String::string(source.c_str(), NS::ASCIIStringEncoding), compileOptions, &error);
@@ -56,16 +55,38 @@ void RendererMTL::reset() {
 	colorRenderTargetCache.reset();
 }
 
-void RendererMTL::display() {
+void RendererMTL::setMTKDrawable(void* drawable, void* tex) {
-#ifdef PANDA3DS_IOS
+	this->metalDrawable = (CA::MetalDrawable*)drawable;
-	return;
+	this->drawableTexture = (MTL::Texture*)tex;
-#endif
+}
 
+void RendererMTL::display() {
+	static int frameCount = 0;
+	frameCount++;
+
+	auto manager = MTL::CaptureManager::sharedCaptureManager();
+	auto captureDescriptor = MTL::CaptureDescriptor::alloc()->init();
+	if (frameCount == 200) {
+		captureDescriptor->setCaptureObject(device);
+		manager->startCapture(captureDescriptor, nullptr);
+	}
+
+#ifdef PANDA3DS_IOS
+	CA::MetalDrawable* drawable = metalDrawable;
+	if (!drawable) {
+		return;
+	}
+
+	MTL::Texture* texture = drawableTexture;
+#else
 	CA::MetalDrawable* drawable = metalLayer->nextDrawable();
 	if (!drawable) {
 		return;
 	}
 
+	MTL::Texture* texture = drawable->getTexture();
+#endif
+
 	using namespace PICA::ExternalRegs;
 
 	// Top screen
@@ -91,13 +112,13 @@ void RendererMTL::display() {
 
 	MTL::RenderPassDescriptor* renderPassDescriptor = MTL::RenderPassDescriptor::alloc()->init();
 	MTL::RenderPassColorAttachmentDescriptor* colorAttachment = renderPassDescriptor->colorAttachments()->object(0);
-	colorAttachment->setTexture(drawable->texture());
+	colorAttachment->setTexture(texture);
 	colorAttachment->setLoadAction(MTL::LoadActionClear);
 	colorAttachment->setClearColor(MTL::ClearColor{0.0f, 0.0f, 0.0f, 1.0f});
 	colorAttachment->setStoreAction(MTL::StoreActionStore);
 
 	nextRenderPassName = "Display";
-	beginRenderPassIfNeeded(renderPassDescriptor, false, drawable->texture());
+	beginRenderPassIfNeeded(renderPassDescriptor, false, texture);
 	renderCommandEncoder->setRenderPipelineState(displayPipeline);
 	renderCommandEncoder->setFragmentSamplerState(nearestSampler, 0);
 
@@ -124,24 +145,32 @@ void RendererMTL::display() {
 	// Inform the vertex buffer cache that the frame ended
 	vertexBufferCache.endFrame();
 
-	// Release
+	// Release the drawable (not on iOS cause SwiftUI handles it there)
+#ifndef PANDA3DS_IOS
 	drawable->release();
+#endif
+
+	if (frameCount == 200) {
+		manager->stopCapture();
+	}
+	captureDescriptor->release();
 }
 
 void RendererMTL::initGraphicsContext(SDL_Window* window) {
-	// TODO: what should be the type of the view?
+	// On iOS, the SwiftUI side handles MetalLayer & the CommandQueue
-
 #ifdef PANDA3DS_IOS
-	// On iOS, the SwiftUI side handles device<->MTKView interaction
 	device = MTL::CreateSystemDefaultDevice();
 #else
+	// TODO: what should be the type of the view?
 	void* view = SDL_Metal_CreateView(window);
 	metalLayer = (CA::MetalLayer*)SDL_Metal_GetLayer(view);
 	device = MTL::CreateSystemDefaultDevice();
 	metalLayer->setDevice(device);
-	commandQueue = device->newCommandQueue();
 #endif
 
+	commandQueue = device->newCommandQueue();
+	printf("C++ device pointer: %p\n", device);
+
 	// Textures
 	MTL::TextureDescriptor* textureDescriptor = MTL::TextureDescriptor::alloc()->init();
 	textureDescriptor->setTextureType(MTL::TextureType2D);
@@ -816,7 +845,7 @@ void RendererMTL::beginRenderPassIfNeeded(
 ) {
 	createCommandBufferIfNeeded();
 
-	if (doesClears || !renderCommandEncoder || colorTexture != lastColorTexture ||
+	if (1 ||doesClears || !renderCommandEncoder || colorTexture != lastColorTexture ||
 		(depthTexture != lastDepthTexture && !(lastDepthTexture && !depthTexture))) {
 		endRenderPass();
 

src/host_shaders/metal_shaders.metal

@@ -655,7 +655,7 @@ 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)]]) {
+fragment float4 fragmentDraw(DrawVertexOut in [[stage_in]], 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 globals;
 
     // HACK
@@ -755,5 +755,5 @@ fragment float4 fragmentDraw(DrawVertexOut in [[stage_in]], float4 prevColor [[c
 		}
 	}
 
-	return performLogicOp(logicOp, color, prevColor);
+	return performLogicOp(logicOp, color, float4(1.0, 0.0, 0.0, 1.0));
 }

src/ios_driver.mm

@@ -15,7 +15,7 @@ extern "C" {
 std::unique_ptr<Emulator> emulator = nullptr;
 HIDService* hidService = nullptr;
 
-extern "C" __attribute__((visibility("default"))) void iosCreateEmulator() {
+IOS_EXPORT void iosCreateEmulator() {
 	printf("Creating emulator\n");
 
 	emulator = std::make_unique<Emulator>();
@@ -23,12 +23,14 @@ extern "C" __attribute__((visibility("default"))) void iosCreateEmulator() {
 	emulator->initGraphicsContext(nullptr);
 
 	// auto path = emulator->getAppDataRoot() / "Kirb Demo.3ds";
+	// auto path = emulator->getAppDataRoot() / "Kirb Demo.3ds";
+
 	auto path = emulator->getAppDataRoot() / "SimplerTri.elf";
 	emulator->loadROM(path);
-
-	while (1) {
-		emulator->runFrame();
-	}
-
 	printf("Created emulator\n");
 }
+
+IOS_EXPORT void iosRunFrame(void* drawable, void* drawableTexture) {
+	emulator->getRenderer()->setMTKDrawable(drawable, drawableTexture);
+	emulator->runFrame();
+}