commit 70728ef8e71edd8e04b413b9a5e94f92c830cadc
author Ethan Nicholas <ethannicholas@google.com> Thu May 28 07:09:00 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 28 13:27:58 2020 +0000
tree 2498528f5b3e1da973050af4e83c5a5395ec945e
parent 5aefbb372568d5df86905acdeb036e816adc9c9f

Revert "Reland "Revert "SkSL function inlining"""

This reverts commit 04ff61faae9bd55ef77cc1e2fae7890c67773631.

Change-Id: Ieb69c76b161ec9e003982d36bb2e28d055ad47a6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/292266
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLMetalCodeGenerator.cpp

diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index 099ab4c..2b222d8 100644
--- a/src/sksl/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -1164,11 +1164,15 @@
 }
 
 void MetalCodeGenerator::writeBlock(const Block& b) {
-    this->writeLine("{");
-    fIndentation++;
+    if (b.fIsScope) {
+        this->writeLine("{");
+        fIndentation++;
+    }
     this->writeStatements(b.fStatements);
-    fIndentation--;
-    this->write("}");
+    if (b.fIsScope) {
+        fIndentation--;
+        this->write("}");
+    }
 }
 
 void MetalCodeGenerator::writeIfStatement(const IfStatement& stmt) {