From da76d74a2d234e1f0a18a48d57de06121667fc08 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sun, 30 Sep 2018 11:05:20 +0200
Subject: [PATCH] [dxvk] Minor internal buffer API cleanup

---
 src/dxvk/dxvk_buffer.h     |  8 ++++++--
 src/dxvk/dxvk_buffer_res.h | 36 ------------------------------------
 2 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/src/dxvk/dxvk_buffer.h b/src/dxvk/dxvk_buffer.h
index d0206aff..ee8e1dd7 100644
--- a/src/dxvk/dxvk_buffer.h
+++ b/src/dxvk/dxvk_buffer.h
@@ -79,7 +79,11 @@ namespace dxvk {
      * \returns Buffer slice descriptor
      */
     DxvkDescriptorInfo getDescriptor(VkDeviceSize offset, VkDeviceSize length) const {
-      return m_physSlice.getDescriptor(offset, length);
+      DxvkDescriptorInfo result;
+      result.buffer.buffer = m_physSlice.handle();
+      result.buffer.offset = m_physSlice.offset() + offset;
+      result.buffer.range  = length;
+      return result;
     }
 
     /**
@@ -89,7 +93,7 @@ namespace dxvk {
      * \returns Physical buffer slice offset
      */
     VkDeviceSize getDynamicOffset(VkDeviceSize offset) const {
-      return m_physSlice.getDynamicOffset(offset);
+      return m_physSlice.offset() + offset;
     }
     
     /**
diff --git a/src/dxvk/dxvk_buffer_res.h b/src/dxvk/dxvk_buffer_res.h
index 166753b7..ca69ef6f 100644
--- a/src/dxvk/dxvk_buffer_res.h
+++ b/src/dxvk/dxvk_buffer_res.h
@@ -90,21 +90,6 @@ namespace dxvk {
       return m_memory.mapPtr(offset);
     }
 
-    /**
-     * \brief Retrieves descriptor info
-     * 
-     * \param [in] offset Buffer slice offset
-     * \param [in] length Buffer slice length
-     * \returns Buffer slice descriptor
-     */
-    DxvkDescriptorInfo getDescriptor(VkDeviceSize offset, VkDeviceSize length) const {
-      DxvkDescriptorInfo result;
-      result.buffer.buffer = m_handle;
-      result.buffer.offset = offset;
-      result.buffer.range  = length;
-      return result;
-    }
-    
     /**
      * \brief Retrieves a physical buffer slice
      * 
@@ -184,27 +169,6 @@ namespace dxvk {
       return DxvkPhysicalBufferSlice(m_buffer, m_offset + offset, length);
     }
 
-    /**
-     * \brief Retrieves descriptor info
-     * 
-     * \param [in] offset Buffer slice offset
-     * \param [in] length Buffer slice length
-     * \returns Buffer slice descriptor
-     */
-    DxvkDescriptorInfo getDescriptor(VkDeviceSize offset, VkDeviceSize length) const {
-      return m_buffer->getDescriptor(m_offset + offset, length);
-    }
-
-    /**
-     * \brief Retrieves dynamic offset
-     * 
-     * \param [in] offset Offset into the slice
-     * \returns Physical buffer slice offset
-     */
-    VkDeviceSize getDynamicOffset(VkDeviceSize offset) const {
-      return m_offset + offset;
-    }
-    
     /**
      * \brief Map pointer
      *