From 38ee8f4f95d185bf1f79d813e4bf342b27032448 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 10 Jan 2018 10:23:51 +0100 Subject: [PATCH] [dxvk] Unbound resource prep work --- src/dxvk/dxvk_context.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp index e2b13ac9..401cdc99 100644 --- a/src/dxvk/dxvk_context.cpp +++ b/src/dxvk/dxvk_context.cpp @@ -1056,7 +1056,7 @@ namespace dxvk { case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - if (res.imageView != nullptr) { + if (res.imageView != nullptr && res.imageView->type() != binding.view) { m_descriptors[i].image.sampler = VK_NULL_HANDLE; m_descriptors[i].image.imageView = res.imageView->handle(); m_descriptors[i].image.imageLayout = res.imageView->imageInfo().layout; @@ -1065,7 +1065,6 @@ namespace dxvk { m_cmd->trackResource(res.imageView->image()); } else { Logger::err("DxvkContext: Unbound or incompatible image descriptor"); - Logger::err(str::format(res.imageView->type(), " ", binding.view)); m_descriptors[i].image.sampler = VK_NULL_HANDLE; m_descriptors[i].image.imageView = VK_NULL_HANDLE; m_descriptors[i].image.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;