From a45e1a71f548e0814d99b1a299911ec7c944887f Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Fri, 31 Aug 2018 16:56:52 -0400 Subject: [PATCH] fixed ASAN error while compiling .fp files Bug: skia: Change-Id: I7242986661c42c43616f42e1dfe01266d10109a3 Reviewed-on: https://skia-review.googlesource.com/150916 Auto-Submit: Ethan Nicholas Commit-Queue: Brian Salomon Reviewed-by: Brian Salomon --- src/sksl/SkSLGLSLCodeGenerator.cpp | 1 - src/sksl/SkSLGLSLCodeGenerator.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp index a12357e73fac9..496e55c08d284 100644 --- a/src/sksl/SkSLGLSLCodeGenerator.cpp +++ b/src/sksl/SkSLGLSLCodeGenerator.cpp @@ -1509,7 +1509,6 @@ void GLSLCodeGenerator::writeInputVars() { } bool GLSLCodeGenerator::generateCode() { - fProgramKind = fProgram.fKind; if (fProgramKind != Program::kPipelineStage_Kind) { this->writeHeader(); } diff --git a/src/sksl/SkSLGLSLCodeGenerator.h b/src/sksl/SkSLGLSLCodeGenerator.h index 95aa46467ebf1..bebd76febd8cd 100644 --- a/src/sksl/SkSLGLSLCodeGenerator.h +++ b/src/sksl/SkSLGLSLCodeGenerator.h @@ -77,7 +77,8 @@ class GLSLCodeGenerator : public CodeGenerator { OutputStream* out) : INHERITED(program, errors, out) , fLineEnding("\n") - , fContext(*context) {} + , fContext(*context) + , fProgramKind(program->fKind) {} bool generateCode() override;