From c0a963ae5b5407e284882a68d6dcf22bb50bf738 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Thu, 14 Dec 2017 19:11:13 +0100 Subject: [PATCH] [dxvk] Renamed DxvkBufferSlice methods for convenience --- src/d3d11/d3d11_context.cpp | 4 ++-- src/dxvk/dxvk_context.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp index 27fd82c3..6d551b8b 100644 --- a/src/d3d11/d3d11_context.cpp +++ b/src/d3d11/d3d11_context.cpp @@ -399,14 +399,14 @@ namespace dxvk { const auto bufferSlice = bufferResource->GetCurrentBufferSlice(); VkDeviceSize offset = 0; - VkDeviceSize size = bufferSlice.bufferRange(); + VkDeviceSize size = bufferSlice.length(); if (pDstBox != nullptr) { offset = pDstBox->left; size = pDstBox->right - pDstBox->left; } - if (offset + size > bufferSlice.bufferRange()) { + if (offset + size > bufferSlice.length()) { Logger::err("D3D11: UpdateSubresource: Buffer size out of bounds"); return; } diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp index 84a3cfd3..8ec67663 100644 --- a/src/dxvk/dxvk_context.cpp +++ b/src/dxvk/dxvk_context.cpp @@ -83,7 +83,7 @@ namespace dxvk { DxvkDescriptorInfo descriptor; - if (buffer.bufferHandle() != VK_NULL_HANDLE) + if (buffer.handle() != VK_NULL_HANDLE) descriptor.buffer = buffer.descriptorInfo(); rc->bindShaderResource(slot, resource, descriptor);