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

start texture binding

Browse Source
This commit is contained in:
Greg Wells
2025-07-01 11:31:55 -04:00
parent 8211876837
commit 76e80081fb
7 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/apis/metal/src/commands/commands/metal_commands.m
View File

@@ -120,12 +120,12 @@ void metalBindUniform(gnCommandBufferHandle buffer, gnUniform uniform, uint32_t
];
} else if (uniform->uniform->bindings[i].type == GN_IMAGE_DESCRIPTOR) {
gnImageUniformInfo info = *(gnImageUniformInfo*)uniform->uniform->bindings[i].data;
[encoder setFragmentTexture:info.texture->texture->texture atIndex:(info.binding + 1)];
[encoder setFragmentTexture:info.texture->texture->texture atIndex:0];
}
}
}
void metalBindVertexBytes(gnCommandBufferHandle buffer, gnPushConstantLayout layout, void* data) {
id<MTLRenderCommandEncoder> encoder = (id<MTLRenderCommandEncoder>)buffer->commandBuffer->encoder;
[encoder setVertexBytes:data length:layout.size atIndex:0]; // TODO: fix this
// [encoder setVertexBytes:data length:layout.size atIndex:0]; // TODO: fix this
}

38
projects/apis/metal/src/pipelines/graphics_pipeline/metal_graphics_pipeline.m
View File

@@ -4,6 +4,8 @@
#include "shader_module/metal_shader_module.h"
#include "surface/metal_surface.h"
#include "utils/math/gryphn_vec3.h"
MTLBlendFactor mtlGryphnBlendFactor(gnBlendFactor factor) {
switch (factor) {
case GN_BLEND_FACTOR_ZERO: return MTLBlendFactorZero;
@@ -71,16 +73,32 @@ gnReturnCode createMetalGraphicsPipeline(gnGraphicsPipeline graphicsPipeline, gn
MTLVertexAttributeDescriptorArray* attributes = vertexDescriptor.attributes;
MTLVertexBufferLayoutDescriptorArray* buffers = vertexDescriptor.layouts;
int k = 0;
for (int i = 0; i < info.shaderInputLayout.bufferCount; i++) {
[[buffers objectAtIndexedSubscript:info.shaderInputLayout.bufferAttributes[i].binding] setStride:info.shaderInputLayout.bufferAttributes[i].size];
for (int j = 0; j < info.shaderInputLayout.bufferAttributes[i].attributeCount; j++) {
attributes[k].bufferIndex = i;
attributes[k].offset = info.shaderInputLayout.bufferAttributes[i].attributes[j].offset;
attributes[k].format = mtlGryphnVertexFormat(info.shaderInputLayout.bufferAttributes[i].attributes[j].format);
k++;
}
}
// layout(location = 0) in vec3 inPosition;
// layout(location = 1) in vec2 inUV;
// layout(location = 2) in vec3 inColor;
[attributes[0] setFormat:MTLVertexFormatFloat3];
[attributes[0] setOffset:0];
[attributes[0] setBufferIndex:0];
[attributes[1] setFormat:MTLVertexFormatFloat2];
[attributes[1] setOffset:(sizeof(float) * 3)];
[attributes[1] setBufferIndex:0];
[attributes[2] setFormat:MTLVertexFormatFloat3];
[attributes[2] setOffset:(sizeof(float) * 5)];
[attributes[2] setBufferIndex:0];
[buffers[0] setStride:(sizeof(float) * 8)];
// int k = 0;
// for (int i = 0; i < info.shaderInputLayout.bufferCount; i++) {
// [[buffers objectAtIndexedSubscript:info.shaderInputLayout.bufferAttributes[i].binding] setStride:info.shaderInputLayout.bufferAttributes[i].size];
// for (int j = 0; j < info.shaderInputLayout.bufferAttributes[i].attributeCount; j++) {
// attributes[k].bufferIndex = i;
// attributes[k].offset = info.shaderInputLayout.bufferAttributes[i].attributes[j].offset;
// attributes[k].format = mtlGryphnVertexFormat(info.shaderInputLayout.bufferAttributes[i].attributes[j].format);
// k++;
// }
// }
[descriptor setVertexDescriptor:vertexDescriptor];
NSError* error = nil;

2
projects/apis/metal/src/shader_module/metal_shader_module.m
View File

@@ -60,6 +60,8 @@ gnReturnCode createMetalShaderModule(gnShaderModule module, gnDevice device, gnS
if (res != SPVC_SUCCESS)
return GN_FAILED_TO_CONVERT_SHADER_CODE;
printf("Shader Module code: %s\n", result);
NSError* error = nil;
MTLCompileOptions* mtloptions = nil;
NSString* sourceCode = [NSString stringWithCString:result encoding:NSUTF8StringEncoding];

5
projects/apis/metal/src/surface/metal_surface.m
View File

@@ -26,7 +26,8 @@ gnSurfaceDetails getMetalSurfaceDetails(
surfaceDetails.formats = (gnSurfaceFormat[]){ { GN_FORMAT_BGRA8_SRGB, GN_COLOR_SPACE_SRGB_NONLINEAR } };
surfaceDetails.minImageCount = 2;
surfaceDetails.maxImageCount = 3;
CGSize size = windowSurface->windowSurface->layer.visibleRect.size;
CGSize size = windowSurface->windowSurface->layer.drawableSize;
printf("Size: %f %f\n", size.width, size.height);
surfaceDetails.minImageSize = surfaceDetails.maxImageSize = surfaceDetails.currentSize = (gnUInt2){size.width, size.height};
return surfaceDetails;
}
@@ -35,7 +36,7 @@ MTLPixelFormat mtlGryphnFormatToMetalFormat(gnImageFormat format) {
switch (format) {
case GN_FORMAT_NONE: return MTLPixelFormatInvalid;
case GN_FORMAT_BGRA8_SRGB: return MTLPixelFormatBGRA8Unorm_sRGB;
case GN_FORMAT_RGBA8_SRGB: return MTLPixelFormatRG8Unorm_sRGB;
case GN_FORMAT_RGBA8_SRGB: return MTLPixelFormatRGBA8Unorm_sRGB;
case GN_FORMAT_D24S8_UINT: return MTLPixelFormatDepth24Unorm_Stencil8;
case GN_FORMAT_D32S8_UINT: return MTLPixelFormatDepth32Float_Stencil8;
}

1
projects/apis/metal/src/uniforms/metal_uniform.m
View File

@@ -11,7 +11,6 @@ void updateMetalBufferUniform(gnUniform uniform, gnBufferUniformInfo* info) {
}
}
void updateMetalImageUniform(gnUniform uniform, gnImageUniformInfo* info) {
for (int i = 0; i < uniform->uniform->bindingCount; i++) {
if (uniform->uniform->bindings[i].binding == info->binding) {

1
projects/apis/metal/src/uniforms/metal_uniform_pool.m
View File

@@ -11,6 +11,7 @@ gnUniform* allocateMetalUniforms(gnUniformPool pool, const gnUniformAllocationIn
for (int i = 0; i < allocInfo.setCount; i++) {
uniforms[i] = malloc(sizeof(struct gnUniform_t));
uniforms[i]->uniform = malloc(sizeof(gnPlatformUniform));
uniforms[i]->uniform->bindingCount = allocInfo.sets[i].uniformBindingCount;
uniforms[i]->uniform->bindings = malloc(sizeof(metalUniformBinding) * allocInfo.sets[i].uniformBindingCount);
for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++) {
uniforms[i]->uniform->bindings[c].type = allocInfo.sets[i].uniformBindings[c].type;