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

[dxvk] Reduced overhead of depth image descriptor layout check

Browse Source
This commit is contained in:
Philip Rebohle 2018-03-09 12:30:39 +01:00
parent e8303af221
commit 8d443cb50d
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/dxvk/dxvk_context.cpp
View File

@ -1476,13 +1476,18 @@ namespace dxvk {
void DxvkContext::updateShaderResources( void DxvkContext::updateShaderResources(
VkPipelineBindPoint bindPoint, VkPipelineBindPoint bindPoint,
const Rc<DxvkPipelineLayout>& layout) { const Rc<DxvkPipelineLayout>& layout) {
DxvkBindingState& bs = DxvkBindingState& bindingState =
bindPoint == VK_PIPELINE_BIND_POINT_GRAPHICS bindPoint == VK_PIPELINE_BIND_POINT_GRAPHICS
? m_state.gp.state.bsBindingState ? m_state.gp.state.bsBindingState
: m_state.cp.state.bsBindingState; : m_state.cp.state.bsBindingState;
bool updatePipelineState = false; bool updatePipelineState = false;
DxvkAttachment depthAttachment;
if (bindPoint == VK_PIPELINE_BIND_POINT_GRAPHICS && m_state.om.framebuffer != nullptr)
DxvkAttachment depthAttachment = m_state.om.framebuffer->renderTargets().getDepthTarget();
for (uint32_t i = 0; i < layout->bindingCount(); i++) { for (uint32_t i = 0; i < layout->bindingCount(); i++) {
const auto& binding = layout->binding(i); const auto& binding = layout->binding(i);
const auto& res = m_rc[binding.slot]; const auto& res = m_rc[binding.slot];
@ -1490,7 +1495,7 @@ namespace dxvk {
switch (binding.type) { switch (binding.type) {
case VK_DESCRIPTOR_TYPE_SAMPLER: case VK_DESCRIPTOR_TYPE_SAMPLER:
if (res.sampler != nullptr) { if (res.sampler != nullptr) {
updatePipelineState |= bs.setBound(i); updatePipelineState |= bindingState.setBound(i);
m_descInfos[i].image.sampler = res.sampler->handle(); m_descInfos[i].image.sampler = res.sampler->handle();
m_descInfos[i].image.imageView = VK_NULL_HANDLE; m_descInfos[i].image.imageView = VK_NULL_HANDLE;
@ -1498,39 +1503,34 @@ namespace dxvk {
m_cmd->trackResource(res.sampler); m_cmd->trackResource(res.sampler);
} else { } else {
updatePipelineState |= bs.setUnbound(i); updatePipelineState |= bindingState.setUnbound(i);
m_descInfos[i].image = m_device->dummySamplerDescriptor(); m_descInfos[i].image = m_device->dummySamplerDescriptor();
} break; } break;
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 && res.imageView->type() == binding.view) { if (res.imageView != nullptr && res.imageView->type() == binding.view) {
updatePipelineState |= bs.setBound(i); updatePipelineState |= bindingState.setBound(i);
m_descInfos[i].image.sampler = VK_NULL_HANDLE; m_descInfos[i].image.sampler = VK_NULL_HANDLE;
m_descInfos[i].image.imageView = res.imageView->handle(); m_descInfos[i].image.imageView = res.imageView->handle();
m_descInfos[i].image.imageLayout = res.imageView->imageInfo().layout; m_descInfos[i].image.imageLayout = res.imageView->imageInfo().layout;
// TODO try to reduce the runtime overhead of all these comparisons
if (bindPoint == VK_PIPELINE_BIND_POINT_GRAPHICS && m_state.om.framebuffer != nullptr) {
DxvkAttachment depthAttachment = m_state.om.framebuffer->renderTargets().getDepthTarget();
if (depthAttachment.view != nullptr if (depthAttachment.view != nullptr
&& depthAttachment.view->image() == res.imageView->image()) && depthAttachment.view->image() == res.imageView->image())
m_descInfos[i].image.imageLayout = depthAttachment.layout; m_descInfos[i].image.imageLayout = depthAttachment.layout;
}
m_cmd->trackResource(res.imageView); m_cmd->trackResource(res.imageView);
m_cmd->trackResource(res.imageView->image()); m_cmd->trackResource(res.imageView->image());
} else { } else {
updatePipelineState |= bs.setUnbound(i); updatePipelineState |= bindingState.setUnbound(i);
m_descInfos[i].image = m_device->dummyImageViewDescriptor(binding.view); m_descInfos[i].image = m_device->dummyImageViewDescriptor(binding.view);
} break; } break;
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
if (res.bufferView != nullptr) { if (res.bufferView != nullptr) {
updatePipelineState |= bs.setBound(i); updatePipelineState |= bindingState.setBound(i);
res.bufferView->updateView(); res.bufferView->updateView();
m_descInfos[i].texelBuffer = res.bufferView->handle(); m_descInfos[i].texelBuffer = res.bufferView->handle();
@ -1538,14 +1538,14 @@ namespace dxvk {
m_cmd->trackResource(res.bufferView->viewResource()); m_cmd->trackResource(res.bufferView->viewResource());
m_cmd->trackResource(res.bufferView->bufferResource()); m_cmd->trackResource(res.bufferView->bufferResource());
} else { } else {
updatePipelineState |= bs.setUnbound(i); updatePipelineState |= bindingState.setUnbound(i);
m_descInfos[i].texelBuffer = m_device->dummyBufferViewDescriptor(); m_descInfos[i].texelBuffer = m_device->dummyBufferViewDescriptor();
} break; } break;
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
if (res.bufferSlice.defined()) { if (res.bufferSlice.defined()) {
updatePipelineState |= bs.setBound(i); updatePipelineState |= bindingState.setBound(i);
auto physicalSlice = res.bufferSlice.physicalSlice(); auto physicalSlice = res.bufferSlice.physicalSlice();
m_descInfos[i].buffer.buffer = physicalSlice.handle(); m_descInfos[i].buffer.buffer = physicalSlice.handle();
@ -1554,7 +1554,7 @@ namespace dxvk {
m_cmd->trackResource(physicalSlice.resource()); m_cmd->trackResource(physicalSlice.resource());
} else { } else {
updatePipelineState |= bs.setUnbound(i); updatePipelineState |= bindingState.setUnbound(i);
m_descInfos[i].buffer = m_device->dummyBufferDescriptor(); m_descInfos[i].buffer = m_device->dummyBufferDescriptor();
} break; } break;