commit a05fa0669bac20e521ac3c1905fe8391fd659e60
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 30 18:55:03 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 30 18:55:03 2014 +0000
tree c524af89c456f8f33911aa2dbfe80b80797bc1a3
parent af091a176dbf900a9ff4526ef3b6966a1de44775

Use GrGLShaderBuilder::GenProgramOutput in GrGLProgram.

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/305203002

git-svn-id: http://skia.googlecode.com/svn/trunk@15002 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLShaderBuilder.cpp

diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp
index 9af2839..f8f810f 100644
--- a/src/gpu/gl/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/GrGLShaderBuilder.cpp
@@ -194,17 +194,15 @@
     ///////////////////////////////////////////////////////////////////////////
     // emit the per-effect code for both color and coverage effects
 
-    fOutput.fColorEffects =
-        this->createAndEmitEffects(colorStages,
-                                   this->desc().getEffectKeys(),
-                                   this->desc().numColorEffects(),
-                                   &inputColor);
+    fOutput.fColorEffects.reset(this->createAndEmitEffects(colorStages,
+                                                           this->desc().getEffectKeys(),
+                                                           this->desc().numColorEffects(),
+                                                           &inputColor));
 
-    fOutput.fCoverageEffects =
-        this->createAndEmitEffects(coverageStages,
+    fOutput.fCoverageEffects.reset(this->createAndEmitEffects(coverageStages,
                                     this->desc().getEffectKeys() + this->desc().numColorEffects(),
                                     this->desc().numCoverageEffects(),
-                                    &inputCoverage);
+                                    &inputCoverage));
 
     this->emitCodeAfterEffects();