commit c5ad209f7b7064933a56712c30ed1f857fa72ed1
author Derek Sollenberger <djsollen@google.com> Fri Aug 05 10:44:00 2022 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Aug 05 17:45:58 2022 +0000
tree ce8ac9acf66c935ffe26c02b6ee0141b753b8dc8
parent af54d8d44268b712fbff5a12bbd072ecd2539317

Fix SkASSERT crash due to an intended workaround being always enabled

This fixes SkQP in debug mode where we hit an assert that the capability
incorrectly returned true when workarounds were disabled.

Change-Id: I00703343819313aefb36c269c09136b8da882c08
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/565896
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/ganesh/vk/GrVkCaps.cpp

diff --git a/src/gpu/ganesh/vk/GrVkCaps.cpp b/src/gpu/ganesh/vk/GrVkCaps.cpp
index 23b969a..a04c1f8 100644
--- a/src/gpu/ganesh/vk/GrVkCaps.cpp
+++ b/src/gpu/ganesh/vk/GrVkCaps.cpp
@@ -606,6 +606,12 @@
     if (kImagination_VkVendor == properties.vendorID) {
         fShaderCaps->fAtan2ImplementedAsAtanYOverX = true;
     }
+
+    // ARM GPUs calculate `matrix * vector` in SPIR-V at full precision, even when the inputs are
+    // RelaxedPrecision. Rewriting the multiply as a sum of vector*scalar fixes this. (skia:11769)
+    if (kARM_VkVendor == properties.vendorID) {
+        fShaderCaps->fRewriteMatrixVectorMultiply = true;
+    }
 }
 
 void GrVkCaps::initGrCaps(const GrVkInterface* vkInterface,
@@ -703,10 +709,6 @@
 
     shaderCaps->fShaderDerivativeSupport = true;
 
-    // ARM GPUs calculate `matrix * vector` in SPIR-V at full precision, even when the inputs are
-    // RelaxedPrecision. Rewriting the multiply as a sum of vector*scalar fixes this. (skia:11769)
-    shaderCaps->fRewriteMatrixVectorMultiply = (kARM_VkVendor == properties.vendorID);
-
     shaderCaps->fDualSourceBlendingSupport = features.features.dualSrcBlend;
 
     shaderCaps->fIntegerSupport = true;