commit d524f16b98c9778add6ce3bc941285b4291bf99b
author egdaniel <egdaniel@google.com> Fri Feb 26 13:06:55 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Feb 26 13:06:55 2016 -0800
tree 00bb180a44afd59f0c4520d22b4d22aa82e1b4ea
parent 87332103c605dc3e0f76c0d1250a76c4ff71fddc

Fix memory crash in vulakn writeUniformBuffers

BUG=skia:5021
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1737593005

Review URL: https://codereview.chromium.org/1737593005

src/gpu/vk/GrVkProgram.cpp

diff --git a/src/gpu/vk/GrVkProgram.cpp b/src/gpu/vk/GrVkProgram.cpp
index cec3eee..00f01b7 100644
--- a/src/gpu/vk/GrVkProgram.cpp
+++ b/src/gpu/vk/GrVkProgram.cpp
@@ -202,10 +202,10 @@
     uint32_t firstUniformWrite = 0;
     uint32_t uniformBindingUpdateCount = 0;
 
+    VkDescriptorBufferInfo vertBufferInfo;
     // Vertex Uniform Buffer
     if (fVertexUniformBuffer.get()) {
         ++uniformBindingUpdateCount;
-        VkDescriptorBufferInfo vertBufferInfo;
         memset(&vertBufferInfo, 0, sizeof(VkDescriptorBufferInfo));
         vertBufferInfo.buffer = fVertexUniformBuffer->buffer();
         vertBufferInfo.offset = 0;
@@ -223,13 +223,13 @@
         descriptorWrites[0].pTexelBufferView = nullptr;
     }
 
+    VkDescriptorBufferInfo fragBufferInfo;
     // Fragment Uniform Buffer
     if (fFragmentUniformBuffer.get()) {
         if (0 == uniformBindingUpdateCount) {
             firstUniformWrite = 1;
         }
         ++uniformBindingUpdateCount;
-        VkDescriptorBufferInfo fragBufferInfo;
         memset(&fragBufferInfo, 0, sizeof(VkDescriptorBufferInfo));
         fragBufferInfo.buffer = fFragmentUniformBuffer->buffer();
         fragBufferInfo.offset = 0;