commit b46f227e1ca944e92b8fb796c957e0119541d456
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Sep 14 14:14:21 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Sep 15 10:16:02 2015 -0600
tree 3f80d65892708bba3b8c1183b55724170cfc0a0d
parent 6eb1aeb0df574905de7d441efa31c3762d97177a

Bug 14583: Updates based on initial feedback

include/vulkan.h

diff --git a/include/vulkan.h b/include/vulkan.h
index c031488..f5fe0bf 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -1782,14 +1782,14 @@
     VkBuffer                                    buffer;
     VkDeviceSize                                offset;
     VkDeviceSize                                range;
-} VkShaderBufferInfo;
+} VkDescriptorBufferInfo;
 
 typedef struct {
     VkBufferView                                bufferView;
     VkSampler                                   sampler;
     VkImageView                                 imageView;
     VkImageLayout                               imageLayout;
-    VkShaderBufferInfo                          shaderBuffer;
+    VkDescriptorBufferInfo                      bufferInfo;
 } VkDescriptorInfo;
 
 typedef struct {

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 810fc3b..1171a2c 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -957,9 +957,9 @@
      * or as shader uniform buffers. So, we'll create the shaderbuffer
      * descriptor here so it's ready if needed.
      */
-    this->m_descriptorInfo.shaderBuffer.buffer = handle();
-    this->m_descriptorInfo.shaderBuffer.offset = 0;
-    this->m_descriptorInfo.shaderBuffer.range = allocationSize;
+    this->m_descriptorInfo.bufferInfo.buffer = handle();
+    this->m_descriptorInfo.bufferInfo.offset = 0;
+    this->m_descriptorInfo.bufferInfo.range = allocationSize;
 }
 
 void VkConstantBufferObj::Bind(VkCmdBuffer cmdBuffer, VkDeviceSize offset, uint32_t binding)