commit a45e1a71f548e0814d99b1a299911ec7c944887f
author Ethan Nicholas <ethannicholas@google.com> Fri Aug 31 16:56:52 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 04 13:32:04 2018 +0000
tree 3be7cd6bf425d73862f75650b052a9283f57c5ba
parent cff3fd834ca8f3849cca81b4cb4353f10d7ad10f

fixed ASAN error while compiling .fp files

Bug: skia:
Change-Id: I7242986661c42c43616f42e1dfe01266d10109a3
Reviewed-on: https://skia-review.googlesource.com/150916
Auto-Submit: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/sksl/SkSLGLSLCodeGenerator.cpp

diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index a12357e..496e55c 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -1509,7 +1509,6 @@
 }
 
 bool GLSLCodeGenerator::generateCode() {
-    fProgramKind = fProgram.fKind;
     if (fProgramKind != Program::kPipelineStage_Kind) {
         this->writeHeader();
     }

src/sksl/SkSLGLSLCodeGenerator.h

diff --git a/src/sksl/SkSLGLSLCodeGenerator.h b/src/sksl/SkSLGLSLCodeGenerator.h
index 95aa464..bebd76f 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.h
+++ b/src/sksl/SkSLGLSLCodeGenerator.h
@@ -77,7 +77,8 @@
                       OutputStream* out)
     : INHERITED(program, errors, out)
     , fLineEnding("\n")
-    , fContext(*context) {}
+    , fContext(*context)
+    , fProgramKind(program->fKind) {}
 
     bool generateCode() override;