[vulkan] remove un-needed methods (google#424)

petermcneeleychromium · Mar 28, 2019 · d68c489 · d68c489
1 parent e31aadd
commit d68c489
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 48 deletions.
diff --git a/src/vulkan/resource.cc b/src/vulkan/resource.cc
@@ -146,14 +146,6 @@ uint32_t Resource::ChooseMemory(uint32_t memory_type_bits,
   return first_non_zero;
 }
 
-const VkMemoryRequirements Resource::GetVkBufferMemoryRequirements(
-    VkBuffer buffer) const {
-  VkMemoryRequirements requirement;
-  device_->GetPtrs()->vkGetBufferMemoryRequirements(device_->GetVkDevice(),
-                                                    buffer, &requirement);
-  return requirement;
-}
-
 Result Resource::AllocateAndBindMemoryToVkBuffer(VkBuffer buffer,
                                                  VkDeviceMemory* memory,
                                                  VkMemoryPropertyFlags flags,
@@ -172,7 +164,9 @@ Result Resource::AllocateAndBindMemoryToVkBuffer(VkBuffer buffer,
   if (memory == nullptr)
     return Result("Vulkan::Given VkDeviceMemory pointer is nullptr");
 
-  auto requirement = GetVkBufferMemoryRequirements(buffer);
+  VkMemoryRequirements requirement;
+  device_->GetPtrs()->vkGetBufferMemoryRequirements(device_->GetVkDevice(),
+                                                    buffer, &requirement);
 
   *memory_type_index =
       ChooseMemory(requirement.memoryTypeBits, flags, force_flags);

diff --git a/src/vulkan/resource.h b/src/vulkan/resource.h
@@ -85,11 +85,7 @@ class Resource {
   Device* device_ = nullptr;
 
  private:
-  const VkMemoryRequirements GetVkBufferMemoryRequirements(
-      VkBuffer buffer) const;
-
   uint32_t size_in_bytes_ = 0;
-
   void* memory_ptr_ = nullptr;
 };
 

diff --git a/src/vulkan/transfer_buffer.cc b/src/vulkan/transfer_buffer.cc
@@ -26,11 +26,6 @@ TransferBuffer::TransferBuffer(Device* device, uint32_t size_in_bytes)
     : Resource(device, size_in_bytes) {}
 
 TransferBuffer::~TransferBuffer() {
-  if (view_ != VK_NULL_HANDLE) {
-    device_->GetPtrs()->vkDestroyBufferView(device_->GetVkDevice(), view_,
-                                            nullptr);
-  }
-
   if (memory_ != VK_NULL_HANDLE) {
     UnMapMemory(memory_);
     device_->GetPtrs()->vkFreeMemory(device_->GetVkDevice(), memory_, nullptr);
@@ -64,22 +59,6 @@ Result TransferBuffer::Initialize(const VkBufferUsageFlags usage) {
   return MapMemory(memory_);
 }
 
-Result TransferBuffer::CreateVkBufferView(VkFormat format) {
-  VkBufferViewCreateInfo buffer_view_info = VkBufferViewCreateInfo();
-  buffer_view_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO;
-  buffer_view_info.buffer = buffer_;
-  buffer_view_info.format = format;
-  buffer_view_info.offset = 0;
-  buffer_view_info.range = VK_WHOLE_SIZE;
-  if (device_->GetPtrs()->vkCreateBufferView(device_->GetVkDevice(),
-                                             &buffer_view_info, nullptr,
-                                             &view_) != VK_SUCCESS) {
-    return Result("Vulkan::Calling vkCreateBufferView Fail");
-  }
-
-  return {};
-}
-
 void TransferBuffer::CopyToDevice(CommandBuffer* command) {
   // This is redundant because this buffer is always host visible
   // and coherent and vkQueueSubmit will make writes from host

diff --git a/src/vulkan/transfer_buffer.h b/src/vulkan/transfer_buffer.h
@@ -43,8 +43,6 @@ class TransferBuffer : public Resource {
   Result Initialize(const VkBufferUsageFlags usage);
 
   VkBuffer GetVkBuffer() const { return buffer_; }
-  Result CreateVkBufferView(VkFormat format);
-  VkBufferView GetVkBufferView() const { return view_; }
 
   // Since |buffer_| is mapped to host accessible and host coherent
   // memory |memory_|, this method only conducts memory barrier to
@@ -61,7 +59,6 @@ class TransferBuffer : public Resource {
 
  private:
   VkBuffer buffer_ = VK_NULL_HANDLE;
-  VkBufferView view_ = VK_NULL_HANDLE;
   VkDeviceMemory memory_ = VK_NULL_HANDLE;
 };
 

diff --git a/src/vulkan/transfer_image.cc b/src/vulkan/transfer_image.cc
@@ -280,7 +280,9 @@ Result TransferImage::AllocateAndBindMemoryToVkImage(
   if (memory == nullptr)
     return Result("Vulkan::Given VkDeviceMemory pointer is nullptr");
 
-  auto requirement = GetVkImageMemoryRequirements(image);
+  VkMemoryRequirements requirement;
+  device_->GetPtrs()->vkGetImageMemoryRequirements(device_->GetVkDevice(),
+                                                   image, &requirement);
 
   *memory_type_index =
       ChooseMemory(requirement.memoryTypeBits, flags, force_flags);
@@ -299,13 +301,5 @@ Result TransferImage::AllocateAndBindMemoryToVkImage(
   return {};
 }
 
-const VkMemoryRequirements TransferImage::GetVkImageMemoryRequirements(
-    VkImage image) const {
-  VkMemoryRequirements requirement;
-  device_->GetPtrs()->vkGetImageMemoryRequirements(device_->GetVkDevice(),
-                                                   image, &requirement);
-  return requirement;
-}
-
 }  // namespace vulkan
 }  // namespace amber
diff --git a/src/vulkan/transfer_image.h b/src/vulkan/transfer_image.h
@@ -37,7 +37,6 @@ class TransferImage : public Resource {
   ~TransferImage() override;
 
   Result Initialize(VkImageUsageFlags usage);
-  VkImage GetVkImage() const { return image_; }
   VkImageView GetVkImageView() const { return view_; }
 
   void ChangeLayout(CommandBuffer* command,
@@ -58,7 +57,6 @@ class TransferImage : public Resource {
                                         VkMemoryPropertyFlags flags,
                                         bool force_flags,
                                         uint32_t* memory_type_index);
-  const VkMemoryRequirements GetVkImageMemoryRequirements(VkImage image) const;
 
   VkBuffer host_accessible_buffer_ = VK_NULL_HANDLE;
   VkDeviceMemory host_accessible_memory_ = VK_NULL_HANDLE;