rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-14 22:29:15 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Unbound resource prep work

Browse Source
This commit is contained in:
Philip Rebohle 2018-01-10 10:23:51 +01:00
parent ee796b966d
commit 38ee8f4f95
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dxvk/dxvk_context.cpp
View File

@ -1056,7 +1056,7 @@ namespace dxvk {
case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
case VK_DESCRIPTOR_TYPE_STORAGE_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.sampler = VK_NULL_HANDLE;
m_descriptors[i].image.imageView = res.imageView->handle(); m_descriptors[i].image.imageView = res.imageView->handle();
m_descriptors[i].image.imageLayout = res.imageView->imageInfo().layout; m_descriptors[i].image.imageLayout = res.imageView->imageInfo().layout;
@ -1065,7 +1065,6 @@ namespace dxvk {
m_cmd->trackResource(res.imageView->image()); m_cmd->trackResource(res.imageView->image());
} else { } else {
Logger::err("DxvkContext: Unbound or incompatible image descriptor"); 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.sampler = VK_NULL_HANDLE;
m_descriptors[i].image.imageView = VK_NULL_HANDLE; m_descriptors[i].image.imageView = VK_NULL_HANDLE;
m_descriptors[i].image.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; m_descriptors[i].image.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;