commit 135e446b9f035f6b028df77b006ac556294d5dbb
author Chris Dalton <csmartdalton@google.com> Tue Jul 18 11:39:14 2017 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 18 18:32:33 2017 +0000
tree 001454aa60c8d8954af49e0d1abb88ec61a50c57
parent c432b0ca8a5022d86f0ccf2efd1064ed9fce2e53

vk: Fix geometry-shader input varying locations

Bug: skia:
Change-Id: I60e0c25fa05ea53b0969fdee54620bec639ae159
Reviewed-on: https://skia-review.googlesource.com/24440
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/vk/GrVkVaryingHandler.cpp

diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp
index d936e2b..9a38159 100644
--- a/src/gpu/vk/GrVkVaryingHandler.cpp
+++ b/src/gpu/vk/GrVkVaryingHandler.cpp
@@ -71,11 +71,12 @@
         var.addLayoutQualifier(location.c_str());
 
         int elementSize = grsltype_to_location_size(var.getType());
-        SkASSERT(elementSize);
+        SkASSERT(elementSize > 0);
         int numElements = 1;
-        if (var.isArray()) {
-           numElements = var.getArrayCount();
+        if (var.isArray() && !var.isUnsizedArray()) {
+            numElements = var.getArrayCount();
         }
+        SkASSERT(numElements > 0);
         locationIndex += elementSize * numElements;
     }
     // Vulkan requires at least 64 locations to be supported for both vertex output and fragment