From 4502816bb604189495af82cdbd035d7071919278 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 14 Dec 2017 19:09:49 +0100
Subject: [PATCH] [dxvk] Renamed DxvkBufferSlice methods for convenience

---
 src/d3d11/d3d11_context.cpp | 10 +++++-----
 src/d3d11/d3d11_device.cpp  |  4 ++--
 src/dxvk/dxvk_buffer.h      |  6 +++---
 src/dxvk/dxvk_context.cpp   | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp
index f928c242c..27fd82c39 100644
--- a/src/d3d11/d3d11_context.cpp
+++ b/src/d3d11/d3d11_context.cpp
@@ -414,7 +414,7 @@ namespace dxvk {
       if (size != 0) {
         m_context->updateBuffer(
           bufferSlice.buffer(),
-          bufferSlice.bufferOffset() + offset,
+          bufferSlice.offset() + offset,
           size, pSrcData);
       }
     } else {
@@ -641,8 +641,8 @@ namespace dxvk {
         
         bufferSlice = DxvkBufferSlice(
           baseSlice.buffer(),
-          baseSlice.bufferOffset() + binding.offset,
-          baseSlice.bufferRange() - binding.offset);
+          baseSlice.offset() + binding.offset,
+          baseSlice.length() - binding.offset);
       }
       
       m_context->bindVertexBuffer(
@@ -670,8 +670,8 @@ namespace dxvk {
       
       bufferSlice = DxvkBufferSlice(
         baseSlice.buffer(),
-        baseSlice.bufferOffset() + binding.offset,
-        baseSlice.bufferRange() - binding.offset);
+        baseSlice.offset() + binding.offset,
+        baseSlice.length() - binding.offset);
     }
     
     // As in Vulkan, the index format can be either a 32-bit
diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
index e66a58eda..49cc8629e 100644
--- a/src/d3d11/d3d11_device.cpp
+++ b/src/d3d11/d3d11_device.cpp
@@ -1156,8 +1156,8 @@ namespace dxvk {
         m_dxvkDevice->createCommandList());
       m_resourceInitContext->updateBuffer(
         bufferSlice.buffer(),
-        bufferSlice.bufferOffset(),
-        bufferSlice.bufferRange(),
+        bufferSlice.offset(),
+        bufferSlice.length(),
         pInitialData->pSysMem);
       m_dxvkDevice->submitCommandList(
         m_resourceInitContext->endRecording(),
diff --git a/src/dxvk/dxvk_buffer.h b/src/dxvk/dxvk_buffer.h
index 8c1252033..9c477cb64 100644
--- a/src/dxvk/dxvk_buffer.h
+++ b/src/dxvk/dxvk_buffer.h
@@ -180,17 +180,17 @@ namespace dxvk {
       return m_buffer;
     }
     
-    VkBuffer bufferHandle() const {
+    VkBuffer handle() const {
       return m_buffer != nullptr
         ? m_buffer->handle()
         : VK_NULL_HANDLE;
     }
     
-    size_t bufferOffset() const {
+    size_t offset() const {
       return m_offset;
     }
     
-    size_t bufferRange() const {
+    size_t length() const {
       return m_length;
     }
     
diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index 6dc45692b..84a3cfd34 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -898,10 +898,10 @@ namespace dxvk {
     if (m_flags.test(DxvkContextFlag::GpDirtyIndexBuffer)) {
       m_flags.clr(DxvkContextFlag::GpDirtyIndexBuffer);
       
-      if (m_state.vi.indexBuffer.bufferHandle() != VK_NULL_HANDLE) {
+      if (m_state.vi.indexBuffer.handle() != VK_NULL_HANDLE) {
         m_cmd->cmdBindIndexBuffer(
-          m_state.vi.indexBuffer.bufferHandle(),
-          m_state.vi.indexBuffer.bufferOffset(),
+          m_state.vi.indexBuffer.handle(),
+          m_state.vi.indexBuffer.offset(),
           m_state.vi.indexType);
         m_cmd->trackResource(
           m_state.vi.indexBuffer.buffer());
@@ -917,8 +917,8 @@ namespace dxvk {
       for (uint32_t i = 0; i < m_state.vi.vertexBuffers.size(); i++) {
         const DxvkBufferSlice vbo = m_state.vi.vertexBuffers.at(i);
         
-        VkBuffer     handle = vbo.bufferHandle();
-        VkDeviceSize offset = vbo.bufferOffset();
+        VkBuffer     handle = vbo.handle();
+        VkDeviceSize offset = vbo.offset();
         
         if (handle != VK_NULL_HANDLE) {
           m_cmd->cmdBindVertexBuffers(i, 1, &handle, &offset);