|
@@ -601,14 +601,8 @@ void ImGui_ImplVulkan_RenderDrawData(ImDrawData* draw_data, VkCommandBuffer comm
|
|
vkCmdSetScissor(command_buffer, 0, 1, &scissor);
|
|
vkCmdSetScissor(command_buffer, 0, 1, &scissor);
|
|
|
|
|
|
// Bind DescriptorSet with font or user texture
|
|
// Bind DescriptorSet with font or user texture
|
|
- VkDescriptorSet desc_set[1] = { (VkDescriptorSet)pcmd->GetTexID() };
|
|
|
|
- if (sizeof(ImTextureID) < sizeof(ImU64))
|
|
|
|
- {
|
|
|
|
- // We don't support texture switches if ImTextureID hasn't been redefined to be 64-bit. Do a flaky check that other textures haven't been used.
|
|
|
|
- IM_ASSERT(pcmd->GetTexID() == (ImTextureID)bd->FontTexture.DescriptorSet);
|
|
|
|
- desc_set[0] = bd->FontTexture.DescriptorSet;
|
|
|
|
- }
|
|
|
|
- vkCmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, bd->PipelineLayout, 0, 1, desc_set, 0, nullptr);
|
|
|
|
|
|
+ VkDescriptorSet desc_set = (VkDescriptorSet)pcmd->GetTexID();
|
|
|
|
+ vkCmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, bd->PipelineLayout, 0, 1, &desc_set, 0, nullptr);
|
|
|
|
|
|
// Draw
|
|
// Draw
|
|
vkCmdDrawIndexed(command_buffer, pcmd->ElemCount, 1, pcmd->IdxOffset + global_idx_offset, pcmd->VtxOffset + global_vtx_offset, 0);
|
|
vkCmdDrawIndexed(command_buffer, pcmd->ElemCount, 1, pcmd->IdxOffset + global_idx_offset, pcmd->VtxOffset + global_vtx_offset, 0);
|