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

make dynamic uniforms work in metal (kinda)

Browse Source
This commit is contained in:
Gregory Wells
2025-07-23 15:30:24 -04:00
parent 0da1a8a4f6
commit 9eadacc5d7
1 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,10 @@ gnUniform* allocateMetalUniforms(gnUniformPool pool, const gnUniformAllocationIn
for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++) { for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++) {
gnUniformBinding binding = allocInfo.sets[i].uniformBindings[c]; gnUniformBinding binding = allocInfo.sets[i].uniformBindings[c];
if (binding.type == GN_UNIFORM_BUFFER_DESCRIPTOR || switch (binding.type) {
binding.type == GN_SHADER_STORE_BUFFER_DESCRIPTOR) { case GN_UNIFORM_BUFFER_DESCRIPTOR:
case GN_DYNAMIC_UNIFORM_BUFFER_DESCRIPTOR:
case GN_SHADER_STORE_BUFFER_DESCRIPTOR: {
MTLArgumentDescriptor* descriptor = [[MTLArgumentDescriptor alloc] init]; MTLArgumentDescriptor* descriptor = [[MTLArgumentDescriptor alloc] init];
descriptor.dataType = MTLDataTypePointer; descriptor.dataType = MTLDataTypePointer;
descriptor.index = 0; descriptor.index = 0;
@@ -33,7 +35,9 @@ gnUniform* allocateMetalUniforms(gnUniformPool pool, const gnUniformAllocationIn
uniforms[i]->uniform->index[allocInfo.sets[i].uniformBindings[c].binding] = currentIndex; uniforms[i]->uniform->index[allocInfo.sets[i].uniformBindings[c].binding] = currentIndex;
currentIndex++; currentIndex++;
} else if (allocInfo.sets[i].uniformBindings[c].type == GN_COMBINED_IMAGE_SAMPLER_DESCRIPTOR) { break;
}
case GN_COMBINED_IMAGE_SAMPLER_DESCRIPTOR: {
MTLArgumentDescriptor* textureDescriptor = [[MTLArgumentDescriptor alloc] init]; MTLArgumentDescriptor* textureDescriptor = [[MTLArgumentDescriptor alloc] init];
textureDescriptor.dataType = MTLDataTypeTexture; textureDescriptor.dataType = MTLDataTypeTexture;
textureDescriptor.index = 1; textureDescriptor.index = 1;
@@ -53,6 +57,9 @@ gnUniform* allocateMetalUniforms(gnUniformPool pool, const gnUniformAllocationIn
[totalArguments addObject:samplerDescriptor]; [totalArguments addObject:samplerDescriptor];
uniforms[i]->uniform->index[binding.binding] = currentIndex; uniforms[i]->uniform->index[binding.binding] = currentIndex;
currentIndex += 2; currentIndex += 2;
break;
}
case GN_UNIFORM_TYPE_MAX: break;
} }
uniforms[i]->uniform->stageUsed[binding.binding] = binding.stage; uniforms[i]->uniform->stageUsed[binding.binding] = binding.stage;
} }