Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 06:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

ios: Pass CAMetalLayer instead of void* to Obj-C++ bridging header

Browse source
This commit is contained in:
wheremyfoodat 2025-03-08 22:11:56 +02:00
parent e378a52b5a
commit 90279e6f9e
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -673,7 +673,7 @@ if(ENABLE_METAL AND APPLE)
target_compile_definitions(AlberCore PUBLIC "PANDA3DS_ENABLE_METAL=1") target_compile_definitions(AlberCore PUBLIC "PANDA3DS_ENABLE_METAL=1")
target_include_directories(AlberCore PRIVATE third_party/metal-cpp) target_include_directories(AlberCore PRIVATE third_party/metal-cpp)
# TODO: check if all of them are needed # TODO: check if all of them are needed
target_link_libraries(AlberCore PRIVATE "-framework Metal" "-framework Foundation" "-framework QuartzCore" resources_renderer_mtl) target_link_libraries(AlberCore PUBLIC "-framework Metal" "-framework Foundation" "-framework QuartzCore" resources_renderer_mtl)
endif() endif()
source_group("Header Files\\Core" FILES ${HEADER_FILES}) source_group("Header Files\\Core" FILES ${HEADER_FILES})

4
include/ios_driver.h
View file

@ -1,4 +1,6 @@
#pragma once #pragma once
#include <Foundation/Foundation.h>
#include <QuartzCore/QuartzCore.h>
void iosCreateEmulator(); void iosCreateEmulator();
void iosRunFrame(void* drawable); void iosRunFrame(CAMetalLayer* layer);

4
src/core/renderer_mtl/renderer_mtl.cpp
View file

@ -57,7 +57,6 @@ void RendererMTL::reset() {
void RendererMTL::setMTKLayer(void* layer) { void RendererMTL::setMTKLayer(void* layer) {
metalLayer = (CA::MetalLayer*)layer; metalLayer = (CA::MetalLayer*)layer;
// metalLayer->retain();
} }
void RendererMTL::display() { void RendererMTL::display() {
@ -127,8 +126,9 @@ void RendererMTL::display() {
// Inform the vertex buffer cache that the frame ended // Inform the vertex buffer cache that the frame ended
vertexBufferCache.endFrame(); vertexBufferCache.endFrame();
drawable->release(); drawable->release();
#ifdef PANDA3DS_IOS #ifdef PANDA3DS_IOS
// metalLayer->release(); // metalLayer->autorelease();
#endif #endif
} }

10
src/ios_driver.mm
View file

@ -30,9 +30,15 @@ IOS_EXPORT void iosCreateEmulator() {
printf("Created emulator\n"); printf("Created emulator\n");
} }
IOS_EXPORT void iosRunFrame(void* layer) { IOS_EXPORT void iosRunFrame(CAMetalLayer* layer) {
printf("Running a frame\n"); printf("Running a frame\n");
emulator->getRenderer()->setMTKLayer(layer); // void* layerBridged = (void*)CFBridgingRetain(layer);
void* layerBridged = (__bridge void*)layer;
emulator->getRenderer()->setMTKLayer(layerBridged);
emulator->runFrame(); emulator->runFrame();
CFRelease(layerBridged);
// CFBridgingAutorelease(layerBridged);
printf("Ran a frame\n"); printf("Ran a frame\n");
} }