commit 361941eec909934eb960f3f2584946bbee48cde3
author Ethan Nicholas <ethannicholas@google.com> Tue May 30 15:41:07 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 31 14:19:15 2017 +0000
tree 02abdf018fc0f54e1e490e48118f3221b9af48ca
parent 1919dc4c052418b14651e39be3a94e160b23c7a7

simplify a confusing expression in SkSLSPIRVCodeGenerator

Bug: skia:
Change-Id: I3ce0c174677cf93903a5fb33287dfe1df3445837
Reviewed-on: https://skia-review.googlesource.com/18141
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Bruce Dawson <brucedawson@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 00ab25c..9cc25b9 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -2566,8 +2566,8 @@
 }
 
 SpvId SPIRVCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf) {
-    MemoryLayout layout = intf.fVariable.fModifiers.fLayout.fPushConstant |
-                          (0 != (intf.fVariable.fModifiers.fFlags & Modifiers::kBuffer_Flag)) ?
+    bool isBuffer = (0 != (intf.fVariable.fModifiers.fFlags & Modifiers::kBuffer_Flag));
+    MemoryLayout layout = (intf.fVariable.fModifiers.fLayout.fPushConstant || isBuffer) ?
                           MemoryLayout(MemoryLayout::k430_Standard) :
                           fDefaultLayout;
     SpvId result = this->nextId();