Skip to content

Fix test_vulkan_interop_image validation errors for missing vkUpdateDescriptorSets #2612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shajder wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix test_vulkan_interop_image validation errors for missing vkUpdateDescriptorSets #2612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bad30d
Correction related to validation layer error for missing vkUpdateDesc…
shajder Feb 5, 2026
477eefd
Merge branch 'main' into vulkan_VL_interop_image_updateDescriptorSets
shajder Apr 10, 2026
8a72dfe
clang format fix
shajder Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test_conformance/common/vulkan_wrapper/vulkan_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,12 +1386,12 @@ void VulkanDescriptorSet::update(uint32_t binding,
vkUpdateDescriptorSets(m_device, 1, &vkWriteDescriptorSet, 0, NULL);
}

void VulkanDescriptorSet::updateArray(uint32_t binding,
void VulkanDescriptorSet::updateArray(uint32_t binding, unsigned numImages,
const VulkanImageViewList &imageViewList)
{
VkDescriptorImageInfo *vkDescriptorImageInfo =
new VkDescriptorImageInfo[imageViewList.size()];
for (size_t i = 0; i < imageViewList.size(); i++)
for (size_t i = 0; i < numImages; i++)
{
vkDescriptorImageInfo[i].sampler = VK_NULL_HANDLE;
vkDescriptorImageInfo[i].imageView = imageViewList[i];
Expand All @@ -1404,7 +1404,7 @@ void VulkanDescriptorSet::updateArray(uint32_t binding,
vkWriteDescriptorSet.dstSet = m_vkDescriptorSet;
vkWriteDescriptorSet.dstBinding = binding;
vkWriteDescriptorSet.dstArrayElement = 0;
vkWriteDescriptorSet.descriptorCount = imageViewList.size();
vkWriteDescriptorSet.descriptorCount = numImages;
vkWriteDescriptorSet.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
vkWriteDescriptorSet.pImageInfo = vkDescriptorImageInfo;
vkWriteDescriptorSet.pBufferInfo = NULL;
Expand Down
2 changes: 1 addition & 1 deletion test_conformance/common/vulkan_wrapper/vulkan_wrapper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ class VulkanDescriptorSet {
void updateArray(uint32_t binding, unsigned numBuffers,
const VulkanBufferList &buffers);
void update(uint32_t binding, const VulkanImageView &imageView);
void updateArray(uint32_t binding,
void updateArray(uint32_t binding, unsigned numImages,
const VulkanImageViewList &imageViewList);
operator VkDescriptorSet() const;
};
Expand Down
6 changes: 3 additions & 3 deletions test_conformance/vulkan/shaders/image2D.comp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
#extension GL_ARB_separate_shader_objects : enable
#extension GL_EXT_shader_explicit_arithmetic_types_int32 : enable

#define MAX_2D_IMAGES 5
#define MAX_2D_IMAGE_MIP_LEVELS 11
#define MAX_2D_IMAGE_DESCRIPTORS MAX_2D_IMAGES * MAX_2D_IMAGE_MIP_LEVELS

layout(binding = 0) buffer Params
{
uint32_t numImage2DDescriptors;
};

layout(binding = 1, ${GLSL_FORMAT}) uniform ${GLSL_TYPE_PREFIX}image2D image2DList[MAX_2D_IMAGE_DESCRIPTORS];
layout(constant_id = 0) const uint MAX_2D_IMAGES = 5;

layout(binding = 1, ${GLSL_FORMAT}) uniform ${GLSL_TYPE_PREFIX}image2D image2DList[MAX_2D_IMAGES * MAX_2D_IMAGE_MIP_LEVELS];
layout(local_size_x = 32, local_size_y = 32) in;

void main()
Expand Down
Loading
Loading