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

comment out metal texture

Browse Source
This commit is contained in:
Greg Wells
2025-05-23 21:59:52 -04:00
parent 2cda27371e
commit 08dd2ccc3d
2 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
rendering_api/metal/src/core/textures/metal_texture.cpp
View File

@@ -1,84 +1,84 @@
#include "metal_texture.h" // #include "metal_texture.h"
GN_EXPORT void gnTextureDataFn(gnTexture& texture, gnSize dataSize, const void* data) { // GN_EXPORT void gnTextureDataFn(gnTexture& texture, gnSize dataSize, const void* data) {
if (texture.texture == nullptr) texture.texture = new gnPlatformTexture(); // if (texture.texture == nullptr) texture.texture = new gnPlatformTexture();
MTL::Region region = MTL::Region(0, 0, 0, texture.textureExtent.x, texture.textureExtent.y, 1); // MTL::Region region = MTL::Region(0, 0, 0, texture.textureExtent.x, texture.textureExtent.y, 1);
NS::UInteger bytesPerRow = texture.textureExtent.x; // NS::UInteger bytesPerRow = texture.textureExtent.x;
if (texture.textureColorFormat == GN_RED) // if (texture.textureColorFormat == GN_RED)
bytesPerRow *= 1; // bytesPerRow *= 1;
else if (texture.textureColorFormat == GN_RGB8) // else if (texture.textureColorFormat == GN_RGB8)
bytesPerRow *= 3; // bytesPerRow *= 3;
else if (texture.textureColorFormat == GN_RGBA8) // else if (texture.textureColorFormat == GN_RGBA8)
bytesPerRow *= 4; // bytesPerRow *= 4;
else if (texture.textureColorFormat == GN_BGRA8) // else if (texture.textureColorFormat == GN_BGRA8)
bytesPerRow *= 4; // bytesPerRow *= 4;
else if (texture.textureColorFormat == GN_DEPTH_STENCIL) // else if (texture.textureColorFormat == GN_DEPTH_STENCIL)
bytesPerRow *= 32; // this number is straight from my ass and may not work // bytesPerRow *= 32; // this number is straight from my ass and may not work
texture.texture->texture->replaceRegion(region, 0, data, bytesPerRow); // texture.texture->texture->replaceRegion(region, 0, data, bytesPerRow);
} // }
GN_EXPORT void gnTextureCubeMapDataFn(gnTexture& texture, gnSize imageDataSize, void* face1, void* face2, void* face3, void* face4, void* face5, void* face6) { // GN_EXPORT void gnTextureCubeMapDataFn(gnTexture& texture, gnSize imageDataSize, void* face1, void* face2, void* face3, void* face4, void* face5, void* face6) {
NS::UInteger bytesPerRow = texture.textureExtent.x; // NS::UInteger bytesPerRow = texture.textureExtent.x;
if (texture.textureColorFormat == GN_RED) // if (texture.textureColorFormat == GN_RED)
bytesPerRow *= 1; // bytesPerRow *= 1;
else if (texture.textureColorFormat == GN_RGB8) // else if (texture.textureColorFormat == GN_RGB8)
bytesPerRow *= 3; // bytesPerRow *= 3;
else if (texture.textureColorFormat == GN_RGBA8) // else if (texture.textureColorFormat == GN_RGBA8)
bytesPerRow *= 4; // bytesPerRow *= 4;
else if (texture.textureColorFormat == GN_BGRA8) // else if (texture.textureColorFormat == GN_BGRA8)
bytesPerRow *= 4; // bytesPerRow *= 4;
else if (texture.textureColorFormat == GN_DEPTH_STENCIL) // else if (texture.textureColorFormat == GN_DEPTH_STENCIL)
bytesPerRow *= 32; // this number is straight from my ass and may not work // bytesPerRow *= 32; // this number is straight from my ass and may not work
MTL::Region region = MTL::Region::Make2D(0, 0, texture.textureExtent.x, texture.textureExtent.y); // MTL::Region region = MTL::Region::Make2D(0, 0, texture.textureExtent.x, texture.textureExtent.y);
texture.texture->texture->replaceRegion(region, 0, 0, face1, bytesPerRow, imageDataSize); // texture.texture->texture->replaceRegion(region, 0, 0, face1, bytesPerRow, imageDataSize);
texture.texture->texture->replaceRegion(region, 0, 1, face2, bytesPerRow, imageDataSize); // texture.texture->texture->replaceRegion(region, 0, 1, face2, bytesPerRow, imageDataSize);
texture.texture->texture->replaceRegion(region, 0, 2, face3, bytesPerRow, imageDataSize); // texture.texture->texture->replaceRegion(region, 0, 2, face3, bytesPerRow, imageDataSize);
texture.texture->texture->replaceRegion(region, 0, 3, face4, bytesPerRow, imageDataSize); // texture.texture->texture->replaceRegion(region, 0, 3, face4, bytesPerRow, imageDataSize);
texture.texture->texture->replaceRegion(region, 0, 4, face5, bytesPerRow, imageDataSize); // texture.texture->texture->replaceRegion(region, 0, 4, face5, bytesPerRow, imageDataSize);
texture.texture->texture->replaceRegion(region, 0, 5, face6, bytesPerRow, imageDataSize); // texture.texture->texture->replaceRegion(region, 0, 5, face6, bytesPerRow, imageDataSize);
} // }
GN_EXPORT gnErrorCode gnCreateTextureFn(gnTexture* texture, const gnOutputDevice& outputDevice) { // GN_EXPORT gnErrorCode gnCreateTextureFn(gnTexture* texture, const gnOutputDevice& outputDevice) {
if (texture->texture == nullptr) texture->texture = new gnPlatformTexture(); // if (texture->texture == nullptr) texture->texture = new gnPlatformTexture();
MTL::TextureDescriptor* textureDescriptor = MTL::TextureDescriptor::alloc()->init(); // MTL::TextureDescriptor* textureDescriptor = MTL::TextureDescriptor::alloc()->init();
if (texture->textureType == GN_TEXTURE_CUBE_MAP) textureDescriptor->setTextureType(MTL::TextureType::TextureTypeCube); // if (texture->textureType == GN_TEXTURE_CUBE_MAP) textureDescriptor->setTextureType(MTL::TextureType::TextureTypeCube);
if (texture->textureColorFormat == GN_RED) // if (texture->textureColorFormat == GN_RED)
textureDescriptor->setPixelFormat(MTL::PixelFormatR8Unorm); // textureDescriptor->setPixelFormat(MTL::PixelFormatR8Unorm);
else if (texture->textureColorFormat == GN_RGB8) // else if (texture->textureColorFormat == GN_RGB8)
return gnReturnError(GN_UNSUPPORTED_COLOR_FORMAT, "GN_RGB8_UNSUPPORTED"); // return gnReturnError(GN_UNSUPPORTED_COLOR_FORMAT, "GN_RGB8_UNSUPPORTED");
else if (texture->textureColorFormat == GN_RGBA8) // else if (texture->textureColorFormat == GN_RGBA8)
textureDescriptor->setPixelFormat(MTL::PixelFormatRGBA8Unorm); // textureDescriptor->setPixelFormat(MTL::PixelFormatRGBA8Unorm);
else if (texture->textureColorFormat == GN_BGRA8) // else if (texture->textureColorFormat == GN_BGRA8)
textureDescriptor->setPixelFormat(MTL::PixelFormatBGRA8Unorm); // textureDescriptor->setPixelFormat(MTL::PixelFormatBGRA8Unorm);
else if (texture->textureColorFormat == GN_DEPTH_STENCIL) // else if (texture->textureColorFormat == GN_DEPTH_STENCIL)
textureDescriptor->setPixelFormat(MTL::PixelFormatDepth32Float_Stencil8); // textureDescriptor->setPixelFormat(MTL::PixelFormatDepth32Float_Stencil8);
else return gnReturnError(GN_UNKNOWN_COLOR_FORMAT, "unknown pixel format"); // else return gnReturnError(GN_UNKNOWN_COLOR_FORMAT, "unknown pixel format");
textureDescriptor->setWidth(texture->textureExtent.x); // textureDescriptor->setWidth(texture->textureExtent.x);
textureDescriptor->setHeight(texture->textureExtent.y); // textureDescriptor->setHeight(texture->textureExtent.y);
// textureDescriptor->setUsage(MTL::TextureUsageRenderTarget | MTL::TextureUsageShaderRead); // // textureDescriptor->setUsage(MTL::TextureUsageRenderTarget | MTL::TextureUsageShaderRead);
texture->texture->texture = outputDevice.physicalOutputDevice->physicalOutputDevice->device->newTexture(textureDescriptor); // texture->texture->texture = outputDevice.physicalOutputDevice->physicalOutputDevice->device->newTexture(textureDescriptor);
MTL::SamplerDescriptor* samplerDescriptor = MTL::SamplerDescriptor::alloc()->init(); // MTL::SamplerDescriptor* samplerDescriptor = MTL::SamplerDescriptor::alloc()->init();
if (texture->minFilter == GN_FILTER_LINEAR) // if (texture->minFilter == GN_FILTER_LINEAR)
samplerDescriptor->setMinFilter(MTL::SamplerMinMagFilter::SamplerMinMagFilterLinear); // samplerDescriptor->setMinFilter(MTL::SamplerMinMagFilter::SamplerMinMagFilterLinear);
else // else
samplerDescriptor->setMinFilter(MTL::SamplerMinMagFilter::SamplerMinMagFilterNearest); // samplerDescriptor->setMinFilter(MTL::SamplerMinMagFilter::SamplerMinMagFilterNearest);
if (texture->magFilter == GN_FILTER_LINEAR) // if (texture->magFilter == GN_FILTER_LINEAR)
samplerDescriptor->setMagFilter(MTL::SamplerMinMagFilter::SamplerMinMagFilterLinear); // samplerDescriptor->setMagFilter(MTL::SamplerMinMagFilter::SamplerMinMagFilterLinear);
else // else
samplerDescriptor->setMagFilter(MTL::SamplerMinMagFilter::SamplerMinMagFilterNearest); // samplerDescriptor->setMagFilter(MTL::SamplerMinMagFilter::SamplerMinMagFilterNearest);
texture->texture->sampler = outputDevice.outputDevice->device->newSamplerState(samplerDescriptor); // texture->texture->sampler = outputDevice.outputDevice->device->newSamplerState(samplerDescriptor);
textureDescriptor->release(); // textureDescriptor->release();
samplerDescriptor->release(); // samplerDescriptor->release();
return GN_SUCCESS; // return GN_SUCCESS;
} // }
GN_EXPORT void gnDestroyTextureFn(gnTexture& texture) { // GN_EXPORT void gnDestroyTextureFn(gnTexture& texture) {
texture.texture->texture->release(); // texture.texture->texture->release();
} // }

16
rendering_api/metal/src/core/textures/metal_texture.h
View File

@@ -1,9 +1,9 @@
#pragma once // #pragma once
#include <core/textures/gryphn_texture.h> // #include <core/textures/gryphn_texture.h>
#include <core/devices/metal_output_devices.h> // #include <core/devices/metal_output_devices.h>
#include <Metal/Metal.hpp> // #include <Metal/Metal.hpp>
struct gnPlatformTexture { // struct gnPlatformTexture {
MTL::Texture* texture; // MTL::Texture* texture;
MTL::SamplerState* sampler; // MTL::SamplerState* sampler;
}; // };