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

dynamially generate the argument descriptor

Browse Source
This commit is contained in:
Gregory Wells
2025-07-21 09:35:00 -04:00
parent 6b71e44d21
commit 36cb91e147
1 changed files with 42 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,85 +13,53 @@ gnUniform* allocateMetalUniforms(gnUniformPool pool, const gnUniformAllocationIn
uniforms[i] = malloc(sizeof(struct gnUniform_t)); uniforms[i] = malloc(sizeof(struct gnUniform_t));
uniforms[i]->uniform = malloc(sizeof(gnPlatformUniform)); uniforms[i]->uniform = malloc(sizeof(gnPlatformUniform));
MTLArgumentDescriptor *texDesc = [[MTLArgumentDescriptor alloc] init]; int currentIndex = 0;
texDesc.dataType = MTLDataTypeTexture; NSMutableArray* arguments = [NSMutableArray arrayWithCapacity:allocInfo.sets[i].uniformBindingCount];
texDesc.index = 0;
texDesc.access = MTLBindingAccessReadOnly;
MTLArgumentDescriptor *samplerDesc = [[MTLArgumentDescriptor alloc] init];
samplerDesc.dataType = MTLDataTypeSampler;
samplerDesc.index = 1;
uniforms[i]->uniform->encoder = [pool->device->outputDevice->device newArgumentEncoderWithArguments:@[texDesc, samplerDesc]]; for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++) {
uniforms[i]->uniform->argumentBuffer = [pool->device->outputDevice->device newBufferWithLength:[uniforms[i]->uniform->encoder encodedLength] if (allocInfo.sets[i].uniformBindings[c].type == GN_IMAGE_DESCRIPTOR) {
options:MTLResourceStorageModeShared]; MTLArgumentDescriptor* textureDescriptor = [[MTLArgumentDescriptor alloc] init];
textureDescriptor.dataType = MTLDataTypeTexture;
textureDescriptor.index = 0;
textureDescriptor.arrayLength = 1;
textureDescriptor.access = MTLBindingAccessReadOnly;
textureDescriptor.textureType = MTLTextureType2DMultisample;
[arguments addObject:textureDescriptor];
MTLArgumentDescriptor* samplerDescriptor = [[MTLArgumentDescriptor alloc] init];
samplerDescriptor.dataType = MTLDataTypeSampler;
samplerDescriptor.index = 1;
samplerDescriptor.arrayLength = 1;
samplerDescriptor.access = MTLBindingAccessReadOnly;
[arguments addObject:samplerDescriptor];
uniforms[i]->uniform->index[allocInfo.sets[i].uniformBindings[c].binding] = currentIndex;
currentIndex += 2;
}
}
for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++) {
if (allocInfo.sets[i].uniformBindings[c].type == GN_UNIFORM_BUFFER_DESCRIPTOR ||
allocInfo.sets[i].uniformBindings[c].type == GN_SHADER_STORE_BUFFER_DESCRIPTOR) {
MTLArgumentDescriptor* bufferDescriptor = [[MTLArgumentDescriptor alloc] init];
bufferDescriptor.dataType = MTLDataTypePointer;
bufferDescriptor.index = currentIndex;
bufferDescriptor.arrayLength = 1;
bufferDescriptor.access = MTLBindingAccessReadOnly;
[arguments addObject:bufferDescriptor];
uniforms[i]->uniform->index[allocInfo.sets[i].uniformBindings[c].binding] = currentIndex;
currentIndex++;
}
}
if (arguments.count > 0) {
uniforms[i]->uniform->encoder = [pool->device->outputDevice->device newArgumentEncoderWithArguments:arguments];
uniforms[i]->uniform->argumentBuffer = [pool->device->outputDevice->device newBufferWithLength:uniforms[i]->uniform->encoder.encodedLength options:MTLResourceStorageModeShared];
[uniforms[i]->uniform->encoder setArgumentBuffer:uniforms[i]->uniform->argumentBuffer offset:0]; [uniforms[i]->uniform->encoder setArgumentBuffer:uniforms[i]->uniform->argumentBuffer offset:0];
}
// int currentIndex = 0; for (int k = 0; k < arguments.count; k++) [[arguments objectAtIndex:k] release];
// NSMutableArray* arguments = [NSMutableArray arrayWithCapacity:allocInfo.sets[i].uniformBindingCount];
// MTLArgumentDescriptor* textureDescriptor = [[MTLArgumentDescriptor alloc] init];
// textureDescriptor.dataType = MTLDataTypeTexture;
// textureDescriptor.index = 0;
// textureDescriptor.arrayLength = 1;
// textureDescriptor.access = MTLBindingAccessReadOnly;
// textureDescriptor.textureType = MTLTextureType2D;
// MTLArgumentDescriptor* samplerDescriptor = [[MTLArgumentDescriptor alloc] init];
// samplerDescriptor.dataType = MTLDataTypeSampler;
// samplerDescriptor.index = 1;
// samplerDescriptor.arrayLength = 1;
// samplerDescriptor.access = MTLBindingAccessReadOnly;
// [arguments addObject:textureDescriptor];
// [arguments addObject:samplerDescriptor];
// for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++) {
// if (allocInfo.sets[i].uniformBindings[c].type == GN_IMAGE_DESCRIPTOR) {
// MTLArgumentDescriptor* textureDescriptor = [[MTLArgumentDescriptor alloc] init];
// textureDescriptor.dataType = MTLDataTypeTexture;
// textureDescriptor.index = 0;
// textureDescriptor.arrayLength = 1;
// textureDescriptor.access = MTLBindingAccessReadOnly;
// textureDescriptor.textureType = MTLTextureType2DMultisample;
// [arguments addObject:textureDescriptor];
// MTLArgumentDescriptor* samplerDescriptor = [[MTLArgumentDescriptor alloc] init];
// samplerDescriptor.dataType = MTLDataTypeSampler;
// samplerDescriptor.index = 1;
// samplerDescriptor.arrayLength = 1;
// samplerDescriptor.access = MTLBindingAccessReadOnly;
// [arguments addObject:samplerDescriptor];
// uniforms[i]->uniform->index[allocInfo.sets[i].uniformBindings[c].binding] = currentIndex;
// currentIndex += 2;
// }
// }
// for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++) {
// if (allocInfo.sets[i].uniformBindings[c].type == GN_UNIFORM_BUFFER_DESCRIPTOR ||
// allocInfo.sets[i].uniformBindings[c].type == GN_SHADER_STORE_BUFFER_DESCRIPTOR) {
// // MTLArgumentDescriptor* bufferDescriptor = [[MTLArgumentDescriptor alloc] init];
// // bufferDescriptor.dataType = MTLDataTypePointer;
// // bufferDescriptor.index = currentIndex;
// // bufferDescriptor.arrayLength = 1;
// // bufferDescriptor.access = MTLBindingAccessReadOnly;
// // [arguments addObject:bufferDescriptor];
// // uniforms[i]->uniform->index[allocInfo.sets[i].uniformBindings[c].binding] = currentIndex;
// // currentIndex++;
// }
// }
// if (arguments.count > 0) {
// uniforms[i]->uniform->encoder = [pool->device->outputDevice->device newArgumentEncoderWithArguments:arguments];
// uniforms[i]->uniform->argumentBuffer = [pool->device->outputDevice->device newBufferWithLength:uniforms[i]->uniform->encoder.encodedLength options:MTLResourceStorageModeShared];
// [uniforms[i]->uniform->encoder setArgumentBuffer:uniforms[i]->uniform->argumentBuffer offset:0];
// }
// printf("argument encoder %p, argument buffer %p\n", uniforms[i]->uniform->encoder, uniforms[i]->uniform->argumentBuffer);
// for (int k = 0; k < arguments.count; k++) [[arguments objectAtIndex:k] release];
} }
return uniforms; return uniforms;
} }