vulkan: suppress sampler field of VkDescriptorImageInfo (guest)
when in the immutable sampler case.
Test: vulkanhal_unittests (needs host side CL)
dEQP-VK.ycbcr* in 64 bit mode
dEQP-VK.binding_model*
bug: 145153816
Change-Id: I84fd8b4f2630b86e80da987b3e010824392599c3
diff --git a/system/vulkan/func_table.cpp b/system/vulkan/func_table.cpp
index 4e02b93..3f77e85 100644
--- a/system/vulkan/func_table.cpp
+++ b/system/vulkan/func_table.cpp
@@ -845,7 +845,8 @@
AEMU_SCOPED_TRACE("vkCreateDescriptorSetLayout");
auto vkEnc = HostConnection::get()->vkEncoder();
VkResult vkCreateDescriptorSetLayout_VkResult_return = (VkResult)0;
- vkCreateDescriptorSetLayout_VkResult_return = vkEnc->vkCreateDescriptorSetLayout(device, pCreateInfo, pAllocator, pSetLayout);
+ auto resources = ResourceTracker::get();
+ vkCreateDescriptorSetLayout_VkResult_return = resources->on_vkCreateDescriptorSetLayout(vkEnc, VK_SUCCESS, device, pCreateInfo, pAllocator, pSetLayout);
return vkCreateDescriptorSetLayout_VkResult_return;
}
static void entry_vkDestroyDescriptorSetLayout(
@@ -926,7 +927,8 @@
{
AEMU_SCOPED_TRACE("vkUpdateDescriptorSets");
auto vkEnc = HostConnection::get()->vkEncoder();
- vkEnc->vkUpdateDescriptorSets(device, descriptorWriteCount, pDescriptorWrites, descriptorCopyCount, pDescriptorCopies);
+ auto resources = ResourceTracker::get();
+ resources->on_vkUpdateDescriptorSets(vkEnc, device, descriptorWriteCount, pDescriptorWrites, descriptorCopyCount, pDescriptorCopies);
}
static VkResult entry_vkCreateFramebuffer(
VkDevice device,