commit 4ee1cdad526fd8b6bb50d6f9d339b2c782257a8b
author egdaniel <egdaniel@google.com> Fri Feb 26 08:18:49 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Feb 26 08:18:49 2016 -0800
tree b6ff005e3325bb503f04337b1b1fc8dea1c412d4
parent 18d6b75829ac5d90050ca4da4f99292c14ff06f0

Fix uniform buffer layout in vulkan

TBR=jvanverth@google.com

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

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

src/gpu/vk/GrVkProgramDataManager.cpp

diff --git a/src/gpu/vk/GrVkProgramDataManager.cpp b/src/gpu/vk/GrVkProgramDataManager.cpp
index fe14cdb..732e937 100644
--- a/src/gpu/vk/GrVkProgramDataManager.cpp
+++ b/src/gpu/vk/GrVkProgramDataManager.cpp
@@ -74,7 +74,11 @@
     }
     buffer = static_cast<char*>(buffer) + uni.fOffset;
     SkASSERT(sizeof(float) == 4);
-    memcpy(buffer, v, arrayCount * sizeof(float));
+    for (int i = 0; i < arrayCount; ++i) {
+        const float* curVec = &v[i];
+        memcpy(buffer, curVec, sizeof(float));
+        buffer = static_cast<char*>(buffer) + 4*sizeof(float);
+    }
 }
 
 void GrVkProgramDataManager::set2f(UniformHandle u, float v0, float v1) const {
@@ -114,7 +118,11 @@
     }
     buffer = static_cast<char*>(buffer) + uni.fOffset;
     SkASSERT(sizeof(float) == 4);
-    memcpy(buffer, v, arrayCount * 2* sizeof(float));
+    for (int i = 0; i < arrayCount; ++i) {
+        const float* curVec = &v[2 * i];
+        memcpy(buffer, curVec, 2 * sizeof(float));
+        buffer = static_cast<char*>(buffer) + 4*sizeof(float);
+    }
 }
 
 void GrVkProgramDataManager::set3f(UniformHandle u, float v0, float v1, float v2) const {
@@ -154,7 +162,11 @@
     }
     buffer = static_cast<char*>(buffer) + uni.fOffset;
     SkASSERT(sizeof(float) == 4);
-    memcpy(buffer, v, arrayCount * 3 * sizeof(float));
+    for (int i = 0; i < arrayCount; ++i) {
+        const float* curVec = &v[3 * i];
+        memcpy(buffer, curVec, 3 * sizeof(float));
+        buffer = static_cast<char*>(buffer) + 4*sizeof(float);
+    }
 }
 
 void GrVkProgramDataManager::set4f(UniformHandle u, float v0, float v1, float v2, float v3) const {
@@ -215,7 +227,7 @@
     memcpy(buffer, &matrix[0], 3 * sizeof(float));
     buffer = static_cast<char*>(buffer) + 4*sizeof(float);
     memcpy(buffer, &matrix[3], 3 * sizeof(float));
-    buffer = static_cast<char*>(buffer) + 4 * sizeof(float);
+    buffer = static_cast<char*>(buffer) + 4*sizeof(float);
     memcpy(buffer, &matrix[6], 3 * sizeof(float));
 }
 
@@ -241,11 +253,11 @@
     for (int i = 0; i < arrayCount; ++i) {
         const float* matrix = &matrices[9 * i];
         memcpy(buffer, &matrix[0], 3 * sizeof(float));
-        buffer = static_cast<char*>(buffer)+4 * sizeof(float);
+        buffer = static_cast<char*>(buffer) + 4*sizeof(float);
         memcpy(buffer, &matrix[3], 3 * sizeof(float));
-        buffer = static_cast<char*>(buffer)+4 * sizeof(float);
+        buffer = static_cast<char*>(buffer) + 4*sizeof(float);
         memcpy(buffer, &matrix[6], 3 * sizeof(float));
-        buffer = static_cast<char*>(buffer)+4 * sizeof(float);
+        buffer = static_cast<char*>(buffer) + 4*sizeof(float);
     }
 }