Added Vulkan Descriptor Sets and Samplers.

gpu/vulkan/vulkan_descriptor_set.cc

Index: gpu/vulkan/vulkan_descriptor_set.cc
diff --git a/gpu/vulkan/vulkan_descriptor_set.cc b/gpu/vulkan/vulkan_descriptor_set.cc
new file mode 100644
index 0000000000000000000000000000000000000000..da7cd0962e2f45a4e47a968ce03576b82f7cba51
--- /dev/null
+++ b/gpu/vulkan/vulkan_descriptor_set.cc
@@ -0,0 +1,115 @@
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "gpu/vulkan/vulkan_descriptor_set.h"
+
+#include "base/logging.h"
+#include "gpu/vulkan/vulkan_descriptor_pool.h"
+#include "gpu/vulkan/vulkan_device_queue.h"
+
+namespace gpu {
+
+VulkanDescriptorSet::~VulkanDescriptorSet() {
+  DCHECK_EQ(static_cast<VkDescriptorSet>(VK_NULL_HANDLE), handle_);
+  DCHECK_EQ(static_cast<VkDescriptorSetLayout>(VK_NULL_HANDLE), layout_);
+  descriptor_pool_->DecrementDescriptorSetCount();
+}
+
+bool VulkanDescriptorSet::Initialize(
+    const std::vector<VkDescriptorSetLayoutBinding>& layout) {
+  VkResult result = VK_SUCCESS;
+  VkDevice device = device_queue_->GetVulkanDevice();
+
+  VkDescriptorSetLayoutCreateInfo layout_create_info = {};
+  layout_create_info.sType =
+      VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+  layout_create_info.bindingCount = static_cast<uint32_t>(layout.size());
+  layout_create_info.pBindings = layout.data();
+
+  result = vkCreateDescriptorSetLayout(device, &layout_create_info, nullptr,
+                                       &layout_);

[piman, 2016/05/18 19:02:18]

I think we'll want to separate out the DescriptorSetLayout, that we'll need for
the PipelineLayouts (for the Pipelines themselves). DescriptorSetLayout is a bit
like a template, and we'll need several instances of DescriptorSets using the
same exact layout (e.g. to handle different data across different instances, or
different frames).

[David Yen, 2016/05/18 21:08:35]

Done.

+  if (VK_SUCCESS != result) {
+    DLOG(ERROR) << "vkCreateDescriptorSetLayout() failed: " << result;
+    return false;
+  }
+
+  VkDescriptorSetAllocateInfo set_allocate_info = {};
+  set_allocate_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+  set_allocate_info.descriptorPool = descriptor_pool_->handle();
+  set_allocate_info.descriptorSetCount = 1;
+  set_allocate_info.pSetLayouts = &layout_;
+
+  result = vkAllocateDescriptorSets(device, &set_allocate_info, &handle_);
+  if (VK_SUCCESS != result) {
+    DLOG(ERROR) << "vkAllocateDescriptorSets() failed: " << result;
+    return false;
+  }
+
+  return true;
+}
+
+void VulkanDescriptorSet::Destroy() {
+  VkDevice device = device_queue_->GetVulkanDevice();
+  if (VK_NULL_HANDLE != handle_) {
+    vkFreeDescriptorSets(device, descriptor_pool_->handle(), 1, &handle_);
+    handle_ = VK_NULL_HANDLE;
+  }
+
+  if (VK_NULL_HANDLE != layout_) {
+    vkDestroyDescriptorSetLayout(device, layout_, nullptr);
+    layout_ = VK_NULL_HANDLE;
+  }
+}
+
+void VulkanDescriptorSet::WriteToDescriptorSet(
+    uint32_t dst_binding,
+    uint32_t dst_array_element,
+    uint32_t descriptor_count,
+    VkDescriptorType descriptor_type,
+    const VkDescriptorImageInfo* image_info,
+    const VkDescriptorBufferInfo* buffer_info,
+    const VkBufferView* texel_buffer_view) {
+  VkWriteDescriptorSet write_descriptor_set = {};
+  write_descriptor_set.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+  write_descriptor_set.dstSet = handle_;
+  write_descriptor_set.dstBinding = dst_binding;
+  write_descriptor_set.dstArrayElement = dst_array_element;
+  write_descriptor_set.descriptorCount = descriptor_count;
+  write_descriptor_set.descriptorType = descriptor_type;
+  write_descriptor_set.pImageInfo = image_info;
+  write_descriptor_set.pBufferInfo = buffer_info;
+  write_descriptor_set.pTexelBufferView = texel_buffer_view;
+
+  vkUpdateDescriptorSets(device_queue_->GetVulkanDevice(), 1,
+                         &write_descriptor_set, 0, nullptr);
+}
+
+void VulkanDescriptorSet::CopyFromDescriptorSet(
+    const VulkanDescriptorSet* source_set,
+    uint32_t src_binding,
+    uint32_t src_array_element,
+    uint32_t dst_binding,
+    uint32_t dst_array_element,
+    uint32_t descriptor_count) {
+  VkCopyDescriptorSet copy_descriptor_set = {};
+  copy_descriptor_set.sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET;
+  copy_descriptor_set.srcSet = source_set->handle();
+  copy_descriptor_set.srcBinding = src_binding;
+  copy_descriptor_set.srcArrayElement = src_array_element;
+  copy_descriptor_set.dstSet = handle_;
+  copy_descriptor_set.dstBinding = dst_binding;
+  copy_descriptor_set.dstArrayElement = dst_array_element;
+  copy_descriptor_set.descriptorCount = descriptor_count;
+
+  vkUpdateDescriptorSets(device_queue_->GetVulkanDevice(), 0, nullptr, 1,
+                         &copy_descriptor_set);
+}
+
+VulkanDescriptorSet::VulkanDescriptorSet(VulkanDeviceQueue* device_queue,
+                                         VulkanDescriptorPool* descriptor_pool)
+    : device_queue_(device_queue), descriptor_pool_(descriptor_pool) {
+  descriptor_pool_->IncrementDescriptorSetCount();
+}
+
+}  // namespace gpu