From 1c1958be44d899a1aaac29fba28982a7b199d828 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 7 Aug 2022 14:07:47 +0200 Subject: [PATCH] [d3d9] Use new resource view binding methods --- src/d3d9/d3d9_device.cpp | 6 +++--- src/d3d9/d3d9_format_helpers.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp index 52cfca35..f32abf62 100644 --- a/src/d3d9/d3d9_device.cpp +++ b/src/d3d9/d3d9_device.cpp @@ -5889,7 +5889,7 @@ namespace dxvk { cImageView = commonTex->GetSampleView(srgb) ](DxvkContext* ctx) mutable { VkShaderStageFlags stage = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT; - ctx->bindResourceView(stage, cSlot, std::move(cImageView), nullptr); + ctx->bindResourceImageView(stage, cSlot, std::move(cImageView)); }); } @@ -5905,7 +5905,7 @@ namespace dxvk { DxsoBindingType::Image, uint32_t(shaderSampler.second)); VkShaderStageFlags stage = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT; - ctx->bindResourceView(stage, slot, nullptr, nullptr); + ctx->bindResourceImageView(stage, slot, nullptr); } }); } @@ -7035,7 +7035,7 @@ namespace dxvk { for (uint32_t i = 0; i < cSize; i++) { auto samplerInfo = RemapStateSamplerShader(DWORD(i)); uint32_t slot = computeResourceSlotId(samplerInfo.first, DxsoBindingType::Image, uint32_t(samplerInfo.second)); - ctx->bindResourceView(stage, slot, nullptr, nullptr); + ctx->bindResourceImageView(stage, slot, nullptr); } }); diff --git a/src/d3d9/d3d9_format_helpers.cpp b/src/d3d9/d3d9_format_helpers.cpp index 59dc3868..d8cd3233 100644 --- a/src/d3d9/d3d9_format_helpers.cpp +++ b/src/d3d9/d3d9_format_helpers.cpp @@ -94,8 +94,8 @@ namespace dxvk { auto tmpBufferView = m_device->createBufferView(srcSlice.buffer(), bufferViewInfo); m_context->setSpecConstant(VK_PIPELINE_BIND_POINT_COMPUTE, 0, specConstantValue); - m_context->bindResourceView(VK_SHADER_STAGE_COMPUTE_BIT, BindingIds::Image, std::move(tmpImageView), nullptr); - m_context->bindResourceView(VK_SHADER_STAGE_COMPUTE_BIT, BindingIds::Buffer, nullptr, std::move(tmpBufferView)); + m_context->bindResourceImageView(VK_SHADER_STAGE_COMPUTE_BIT, BindingIds::Image, std::move(tmpImageView)); + m_context->bindResourceBufferView(VK_SHADER_STAGE_COMPUTE_BIT, BindingIds::Buffer, std::move(tmpBufferView)); m_context->bindShader(VK_SHADER_STAGE_COMPUTE_BIT, Rc(m_shaders[videoFormat.FormatType])); m_context->pushConstants(0, sizeof(VkExtent2D), &imageExtent); m_context->dispatch(