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

change GN_IMAGE_DESCRIPTOR to GN_COMBINED_IMAGE_SAMPLER_DESCRIPTOR

Browse Source
This commit is contained in:
Gregory Wells
2025-07-21 10:51:55 -04:00
parent 6ac58529db
commit 46d1c2e802
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ 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++) {
if (allocInfo.sets[i].uniformBindings[c].type == GN_IMAGE_DESCRIPTOR) { if (allocInfo.sets[i].uniformBindings[c].type == GN_COMBINED_IMAGE_SAMPLER_DESCRIPTOR) {
MTLArgumentDescriptor* textureDescriptor = [[MTLArgumentDescriptor alloc] init]; MTLArgumentDescriptor* textureDescriptor = [[MTLArgumentDescriptor alloc] init];
textureDescriptor.dataType = MTLDataTypeTexture; textureDescriptor.dataType = MTLDataTypeTexture;
textureDescriptor.index = 0; textureDescriptor.index = 0;

2
projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.c
View File

@@ -5,7 +5,7 @@ VkDescriptorType vkGryphnUniformType(gnUniformType type) {
switch(type) { switch(type) {
case GN_UNIFORM_BUFFER_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; case GN_UNIFORM_BUFFER_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
case GN_SHADER_STORE_BUFFER_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; case GN_SHADER_STORE_BUFFER_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
case GN_IMAGE_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; case GN_COMBINED_IMAGE_SAMPLER_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
case GN_UNIFORM_TYPE_MAX: return VK_DESCRIPTOR_TYPE_MAX_ENUM; case GN_UNIFORM_TYPE_MAX: return VK_DESCRIPTOR_TYPE_MAX_ENUM;
} }
} }

2
projects/core/src/uniforms/gryphn_uniform_layout.h
View File

@@ -4,8 +4,8 @@
typedef enum gnUniformType { typedef enum gnUniformType {
GN_UNIFORM_BUFFER_DESCRIPTOR, GN_UNIFORM_BUFFER_DESCRIPTOR,
GN_IMAGE_DESCRIPTOR,
GN_SHADER_STORE_BUFFER_DESCRIPTOR, GN_SHADER_STORE_BUFFER_DESCRIPTOR,
GN_COMBINED_IMAGE_SAMPLER_DESCRIPTOR,
GN_UNIFORM_TYPE_MAX GN_UNIFORM_TYPE_MAX
} gnUniformType; } gnUniformType;