From b8a82f2bce265a09173a90dfbe4ce78e52347ba4 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Fri, 13 Feb 2015 16:31:46 -0800 Subject: Revert of Multi-string shaders (patchset #4 id:60001 of https://codereview.chromium.org/929503002/) Reason for revert: windows warnings Original issue's description: > Multi-string shaders > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/1c3c2d83364ee228e0751df0e1b9c161c0ba8c1e TBR=bsalomon@google.com,joshualitt@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/924973002 --- src/gpu/gl/builders/GrGLProgramBuilder.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/gpu/gl/builders/GrGLProgramBuilder.h') diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h index 46d2816c52..37908f9971 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h @@ -356,12 +356,7 @@ protected: }; class AutoStageAdvance { public: - AutoStageAdvance(GrGLProgramBuilder* pb) - : fPB(pb) { - fPB->reset(); - // Each output to the fragment processor gets its own code section - fPB->fFS.nextStage(); - } + AutoStageAdvance(GrGLProgramBuilder* pb) : fPB(pb) { fPB->reset(); } ~AutoStageAdvance() { fPB->exitStage(); } private: GrGLProgramBuilder* fPB; -- cgit v1.2.3