From 46d1c2e8023056c8f76989ce55b06ca40cf284b8 Mon Sep 17 00:00:00 2001 From: Gregory Wells Date: Mon, 21 Jul 2025 10:51:55 -0400 Subject: [PATCH] change GN_IMAGE_DESCRIPTOR to GN_COMBINED_IMAGE_SAMPLER_DESCRIPTOR --- projects/apis/metal/src/uniforms/metal_uniform_pool.m | 2 +- projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.c | 2 +- projects/core/src/uniforms/gryphn_uniform_layout.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/apis/metal/src/uniforms/metal_uniform_pool.m b/projects/apis/metal/src/uniforms/metal_uniform_pool.m index 65985ad..0a0c4de 100644 --- a/projects/apis/metal/src/uniforms/metal_uniform_pool.m +++ b/projects/apis/metal/src/uniforms/metal_uniform_pool.m @@ -18,7 +18,7 @@ gnUniform* allocateMetalUniforms(gnUniformPool pool, const gnUniformAllocationIn 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]; textureDescriptor.dataType = MTLDataTypeTexture; textureDescriptor.index = 0; diff --git a/projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.c b/projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.c index bd325e2..91df1c1 100644 --- a/projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.c +++ b/projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.c @@ -5,7 +5,7 @@ VkDescriptorType vkGryphnUniformType(gnUniformType type) { switch(type) { 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_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; } } diff --git a/projects/core/src/uniforms/gryphn_uniform_layout.h b/projects/core/src/uniforms/gryphn_uniform_layout.h index e12f0f8..240ce3d 100644 --- a/projects/core/src/uniforms/gryphn_uniform_layout.h +++ b/projects/core/src/uniforms/gryphn_uniform_layout.h @@ -4,8 +4,8 @@ typedef enum gnUniformType { GN_UNIFORM_BUFFER_DESCRIPTOR, - GN_IMAGE_DESCRIPTOR, GN_SHADER_STORE_BUFFER_DESCRIPTOR, + GN_COMBINED_IMAGE_SAMPLER_DESCRIPTOR, GN_UNIFORM_TYPE_MAX } gnUniformType;