From f0a104e6f16dc095286d32f1e104894ae0b2b19f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 10 Jul 2012 17:51:07 +0000 Subject: Remove GrStringBuilder Review URL: http://codereview.appspot.com/6343093/ git-svn-id: http://skia.googlecode.com/svn/trunk@4514 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/gl/GrGLShaderBuilder.h | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'src/gpu/gl/GrGLShaderBuilder.h') diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h index cc8bc003a7..002a20a663 100644 --- a/src/gpu/gl/GrGLShaderBuilder.h +++ b/src/gpu/gl/GrGLShaderBuilder.h @@ -91,23 +91,22 @@ public: int stageNum, const char** vsOutName = NULL, const char** fsInName = NULL); - - - GrStringBuilder fHeader; // VS+FS, GLSL version, etc - VarArray fVSUnis; - VarArray fVSAttrs; - VarArray fVSOutputs; - VarArray fGSInputs; - VarArray fGSOutputs; - VarArray fFSInputs; - GrStringBuilder fGSHeader; // layout qualifiers specific to GS - VarArray fFSUnis; - VarArray fFSOutputs; - GrStringBuilder fFSFunctions; - GrStringBuilder fVSCode; - GrStringBuilder fGSCode; - GrStringBuilder fFSCode; - bool fUsesGS; + + SkString fHeader; // VS+FS, GLSL version, etc + VarArray fVSUnis; + VarArray fVSAttrs; + VarArray fVSOutputs; + VarArray fGSInputs; + VarArray fGSOutputs; + VarArray fFSInputs; + SkString fGSHeader; // layout qualifiers specific to GS + VarArray fFSUnis; + VarArray fFSOutputs; + SkString fFSFunctions; + SkString fVSCode; + SkString fGSCode; + SkString fFSCode; + bool fUsesGS; /// Per-stage settings - only valid while we're inside /// GrGLProgram::genStageCode(). @@ -119,12 +118,12 @@ public: /// True if fSampleCoords is an expression; false if it's a bare /// variable name bool fComplexCoord; - GrStringBuilder fSampleCoords; + SkString fSampleCoords; - GrStringBuilder fSwizzle; - GrStringBuilder fModulate; + SkString fSwizzle; + SkString fModulate; - GrStringBuilder fTexFunc; + SkString fTexFunc; //@} -- cgit v1.2.3