AstralTech/Gryphn
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrite device creation in C

Browse Source
This commit is contained in:
Greg Wells
2025-05-21 14:56:45 -04:00
parent 7341abb617
commit 586b5bdd0c
18 changed files with 274 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
rendering_api/metal/src/core/devices/metal_output_device.cpp
View File

@@ -1,98 +1,98 @@
#include <core/output_device/gryphn_physical_output_device.h>
#include <Metal/Metal.hpp>
#include <core/metal_instance.h>
#include "metal_output_devices.h"
// #include <core/output_device/gryphn_physical_output_device.h>
// #include <Metal/Metal.hpp>
// #include <core/metal_instance.h>
// #include "metal_output_devices.h"
struct mtlFramebufferVertex {
float x, y;
float u, v;
};
// struct mtlFramebufferVertex {
// float x, y;
// float u, v;
// };
GN_EXPORT gnReturnCode gnRegisterOutputDeviceFn(gnOutputDevice* outputDevice, const gnInstance& instance, const gnPhysicalOutputDevice& physicalDevice) {
if (outputDevice->outputDevice == nullptr) outputDevice->outputDevice = new gnPlatformOutputDevice();
outputDevice->physicalOutputDevice = const_cast<gnPhysicalOutputDevice*>(&physicalDevice);
// GN_EXPORT gnReturnCode gnRegisterOutputDeviceFn(gnOutputDevice* outputDevice, const gnInstance& instance, const gnPhysicalOutputDevice& physicalDevice) {
// if (outputDevice->outputDevice == nullptr) outputDevice->outputDevice = new gnPlatformOutputDevice();
// outputDevice->physicalOutputDevice = const_cast<gnPhysicalOutputDevice*>(&physicalDevice);
// instance.instance->metalLayer->setDevice(physicalDevice.physicalOutputDevice->device);
// // instance.instance->metalLayer->setDevice(physicalDevice.physicalOutputDevice->device);
// outputDevice->outputDevice->contentView = instance.instance->metalContentView->retain();
outputDevice->outputDevice->device = physicalDevice.physicalOutputDevice->device->retain();
outputDevice->outputDevice->commandQueue = outputDevice->outputDevice->device->newCommandQueue();
outputDevice->outputDevice->instance = const_cast<gnInstance*>(&instance);
// // outputDevice->outputDevice->contentView = instance.instance->metalContentView->retain();
// outputDevice->outputDevice->device = physicalDevice.physicalOutputDevice->device->retain();
// outputDevice->outputDevice->commandQueue = outputDevice->outputDevice->device->newCommandQueue();
// outputDevice->outputDevice->instance = const_cast<gnInstance*>(&instance);
{
const char* shaderSrc = R"metal(
#include <metal_stdlib>
using namespace metal;
// {
// const char* shaderSrc = R"metal(
// #include <metal_stdlib>
// using namespace metal;
struct VertexOut {
float4 position [[position]];
float2 uv;
};
// struct VertexOut {
// float4 position [[position]];
// float2 uv;
// };
vertex VertexOut vs_main(uint vertexID [[vertex_id]]) {
float2 positions[4] = {
{-1.0, -1.0},
{ 1.0, -1.0},
{-1.0, 1.0},
{ 1.0, 1.0}
};
float2 uvs[4] = {
{0.0, 1.0},
{1.0, 1.0},
{0.0, 0.0},
{1.0, 0.0}
};
// vertex VertexOut vs_main(uint vertexID [[vertex_id]]) {
// float2 positions[4] = {
// {-1.0, -1.0},
// { 1.0, -1.0},
// {-1.0, 1.0},
// { 1.0, 1.0}
// };
// float2 uvs[4] = {
// {0.0, 1.0},
// {1.0, 1.0},
// {0.0, 0.0},
// {1.0, 0.0}
// };
VertexOut out;
out.position = float4(positions[vertexID], 0.0, 1.0);
out.uv = uvs[vertexID];
return out;
}
// VertexOut out;
// out.position = float4(positions[vertexID], 0.0, 1.0);
// out.uv = uvs[vertexID];
// return out;
// }
fragment float4 fs_main(VertexOut in [[stage_in]],
texture2d<float> colorTex [[texture(0)]],
sampler samp [[sampler(0)]]) {
return colorTex.sample(samp, in.uv);
}
)metal";
// fragment float4 fs_main(VertexOut in [[stage_in]],
// texture2d<float> colorTex [[texture(0)]],
// sampler samp [[sampler(0)]]) {
// return colorTex.sample(samp, in.uv);
// }
// )metal";
NS::Error* error = nullptr;
MTL::CompileOptions* options = nullptr;
MTL::Library* library = physicalDevice.physicalOutputDevice->device->newLibrary(NS::String::string(shaderSrc, NS::UTF8StringEncoding), options, &error);
if (!library) {
return gnReturnError(GN_FAILED_CREATE_DEVICE, error->localizedDescription()->utf8String());
}
MTL::Function* vs = library->newFunction(NS::String::string("vs_main", NS::UTF8StringEncoding));
MTL::Function* fs = library->newFunction(NS::String::string("fs_main", NS::UTF8StringEncoding));
// NS::Error* error = nullptr;
// MTL::CompileOptions* options = nullptr;
// MTL::Library* library = physicalDevice.physicalOutputDevice->device->newLibrary(NS::String::string(shaderSrc, NS::UTF8StringEncoding), options, &error);
// if (!library) {
// return gnReturnError(GN_FAILED_CREATE_DEVICE, error->localizedDescription()->utf8String());
// }
// MTL::Function* vs = library->newFunction(NS::String::string("vs_main", NS::UTF8StringEncoding));
// MTL::Function* fs = library->newFunction(NS::String::string("fs_main", NS::UTF8StringEncoding));
MTL::RenderPipelineDescriptor* pipelineDesc = MTL::RenderPipelineDescriptor::alloc()->init();
pipelineDesc->setVertexFunction(vs);
pipelineDesc->setFragmentFunction(fs);
pipelineDesc->colorAttachments()->object(0)->setPixelFormat(MTL::PixelFormatBGRA8Unorm);
// MTL::RenderPipelineDescriptor* pipelineDesc = MTL::RenderPipelineDescriptor::alloc()->init();
// pipelineDesc->setVertexFunction(vs);
// pipelineDesc->setFragmentFunction(fs);
// pipelineDesc->colorAttachments()->object(0)->setPixelFormat(MTL::PixelFormatBGRA8Unorm);
instance.instance->framebufferRenderer = outputDevice->outputDevice->device->newRenderPipelineState(pipelineDesc, &error);
if (!instance.instance->framebufferRenderer) {
return gnReturnError(GN_FAILED_CREATE_DEVICE, error->localizedDescription()->utf8String());
}
}
// instance.instance->framebufferRenderer = outputDevice->outputDevice->device->newRenderPipelineState(pipelineDesc, &error);
// if (!instance.instance->framebufferRenderer) {
// return gnReturnError(GN_FAILED_CREATE_DEVICE, error->localizedDescription()->utf8String());
// }
// }
return GN_SUCCESS;
}
// return GN_SUCCESS;
// }
GN_EXPORT void gnWaitForDeviceFn(const gnOutputDevice& device) {
NS::AutoreleasePool* pool = NS::AutoreleasePool::alloc()->init();
// GN_EXPORT void gnWaitForDeviceFn(const gnOutputDevice& device) {
// NS::AutoreleasePool* pool = NS::AutoreleasePool::alloc()->init();
auto mtlDevice = device.physicalOutputDevice->physicalOutputDevice->device;
// auto mtlDevice = device.physicalOutputDevice->physicalOutputDevice->device;
auto commandBuffer = device.outputDevice->commandQueue->commandBuffer();
// auto commandBuffer = device.outputDevice->commandQueue->commandBuffer();
commandBuffer->commit();
commandBuffer->waitUntilCompleted();
// commandBuffer->commit();
// commandBuffer->waitUntilCompleted();
pool->release();
}
// pool->release();
// }
GN_EXPORT void gnDestroyOutputDeviceFn(gnOutputDevice& device) {
device.outputDevice->commandQueue->release();
device.physicalOutputDevice->physicalOutputDevice->device->release();
}
// GN_EXPORT void gnDestroyOutputDeviceFn(gnOutputDevice& device) {
// device.outputDevice->commandQueue->release();
// device.physicalOutputDevice->physicalOutputDevice->device->release();
// }

26
rendering_api/metal/src/core/devices/metal_output_devices.h
View File

@@ -1,16 +1,16 @@
#pragma once
#include <Metal/Metal.hpp>
#include <MetalKit/MetalKit.hpp>
// #pragma once
// #include <Metal/Metal.hpp>
// #include <MetalKit/MetalKit.hpp>
struct gnPlatformPhysicalOutputDevice {
MTL::Device* device;
};
struct gnInstance;
// struct gnPlatformPhysicalOutputDevice {
// MTL::Device* device;
// };
// struct gnInstance;
struct gnPlatformOutputDevice {
MTL::Device* device;
MTL::CommandQueue* commandQueue;
MTK::View* contentView;
// struct gnPlatformOutputDevice {
// MTL::Device* device;
// MTL::CommandQueue* commandQueue;
// MTK::View* contentView;
gnInstance* instance;
};
// gnInstance* instance;
// };

42
rendering_api/metal/src/core/devices/metal_physical_device.cpp
View File

@@ -1,23 +1,23 @@
#include <core/output_device/gryphn_physical_output_device.h>
#include <Metal/Metal.hpp>
#include "metal_output_devices.h"
// #include <core/output_device/gryphn_physical_output_device.h>
// #include <Metal/Metal.hpp>
// #include "metal_output_devices.h"
GN_EXPORT gnPhysicalOutputDevice* gnGetPhysicalOutputDevicesFn(const gnInstance& instance, uint32_t* count) {
// gnList<gnPhysicalOutputDevice> physicalOutputDevices = gnCreateList<gnPhysicalOutputDevice>();
NS::Array *devices = MTL::CopyAllDevices();
gnPhysicalOutputDevice* devicesList = (gnPhysicalOutputDevice*)malloc(sizeof(gnPhysicalOutputDevice) * devices->count());
for (int i = 0; i < devices->count(); i++) {
devicesList[i].outputDeviceName = reinterpret_cast<MTL::Device*>(devices->object(0))->name()->cString(NS::StringEncoding::UTF8StringEncoding);
devicesList[i].physicalOutputDevice = new gnPlatformPhysicalOutputDevice();
devicesList[i].physicalOutputDevice->device = reinterpret_cast<MTL::Device*>(devices->object(0));
}
*count = devices->count();
return devicesList;
}
// GN_EXPORT gnPhysicalOutputDevice* gnGetPhysicalOutputDevicesFn(const gnInstance& instance, uint32_t* count) {
// // gnList<gnPhysicalOutputDevice> physicalOutputDevices = gnCreateList<gnPhysicalOutputDevice>();
// NS::Array *devices = MTL::CopyAllDevices();
// gnPhysicalOutputDevice* devicesList = (gnPhysicalOutputDevice*)malloc(sizeof(gnPhysicalOutputDevice) * devices->count());
// for (int i = 0; i < devices->count(); i++) {
// devicesList[i].outputDeviceName = reinterpret_cast<MTL::Device*>(devices->object(0))->name()->cString(NS::StringEncoding::UTF8StringEncoding);
// devicesList[i].physicalOutputDevice = new gnPlatformPhysicalOutputDevice();
// devicesList[i].physicalOutputDevice->device = reinterpret_cast<MTL::Device*>(devices->object(0));
// }
// *count = devices->count();
// return devicesList;
// }
GN_EXPORT gnBool gnDeviceSupportsAPIFn(const gnPhysicalOutputDevice& device) {
// so as far as my understanding goes which is not very far I dont think that the
// method I am using to ge the devices would return a list of devices that are not supported on
// metal but idk or really care cuz fuck you for using metal
return true;
}
// GN_EXPORT gnBool gnDeviceSupportsAPIFn(const gnPhysicalOutputDevice& device) {
// // so as far as my understanding goes which is not very far I dont think that the
// // method I am using to ge the devices would return a list of devices that are not supported on
// // metal but idk or really care cuz fuck you for using metal
// return true;
// }