From 9441534f6b0bb89fd8d0fca73e4d1f51eb6c2c38 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtney@LunarG.com>
Date: Mon, 14 Sep 2015 14:14:21 -0600
Subject: Bug 14583: Updates based on initial feedback

---
 demos/cube.c     | 6 +++---
 include/vulkan.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demos/cube.c b/demos/cube.c
index 13565d34..97107b3c 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1319,9 +1319,9 @@ void demo_prepare_cube_data_buffer(struct demo *demo)
             demo->uniform_data.mem, 0);
     assert(!err);
 
-    demo->uniform_data.desc.shaderBuffer.buffer = demo->uniform_data.buf;
-    demo->uniform_data.desc.shaderBuffer.offset = 0;
-    demo->uniform_data.desc.shaderBuffer.range = sizeof(data);
+    demo->uniform_data.desc.bufferInfo.buffer = demo->uniform_data.buf;
+    demo->uniform_data.desc.bufferInfo.offset = 0;
+    demo->uniform_data.desc.bufferInfo.range = sizeof(data);
 }
 
 static void demo_prepare_descriptor_layout(struct demo *demo)
diff --git a/include/vulkan.h b/include/vulkan.h
index c031488d..f5fe0bfa 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -1782,14 +1782,14 @@ typedef struct {
     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 {
-- 
cgit v1.2.3