Index: src/gpu/gl/builders/GrGLProgramBuilder.h |
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h |
index a44fa91090969622692cb7be284d5abf53f2f915..4bcf50be6a10913637eb0118c5b1d3a7232b56f4 100644 |
--- a/src/gpu/gl/builders/GrGLProgramBuilder.h |
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.h |
@@ -241,7 +241,8 @@ |
// generating stage code. |
void nameVariable(SkString* out, char prefix, const char* name); |
void setupUniformColorAndCoverageIfNeeded(GrGLSLExpr4* inputColor, GrGLSLExpr1* inputCoverage); |
- void emitAndInstallProcs(GrGLSLExpr4* inputColor, |
+ void emitAndInstallProcs(const GrOptDrawState& optState, |
+ GrGLSLExpr4* inputColor, |
GrGLSLExpr4* inputCoverage); |
void emitAndInstallFragProcs(int procOffset, int numProcs, GrGLSLExpr4* inOut); |
template <class Proc> |
@@ -258,8 +259,8 @@ |
const char* inColor); |
void emitAndInstallProc(const GrGeometryProcessor&, |
const GrProcessorKey&, |
- const char* outCoverage, |
- const char* inCoverage); |
+ const char* outColor, |
+ const char* inColor); |
void verify(const GrGeometryProcessor&); |
void verify(const GrFragmentProcessor&); |
void emitSamplers(const GrProcessor&, |
@@ -313,22 +314,6 @@ |
void enterStage() { fOutOfStage = false; } |
int stageIndex() const { return fStageIndex; } |
- struct TransformVarying { |
- TransformVarying(const GrGLVarying& v, const char* uniName, const char* sourceCoords) |
- : fV(v), fUniName(uniName), fSourceCoords(sourceCoords) {} |
- GrGLVarying fV; |
- SkString fUniName; |
- SkString fSourceCoords; |
- }; |
- |
- void addCoordVarying(const char* name, GrGLVarying* v, const char* uniName, |
- const char* sourceCoords) { |
- this->addVarying(name, v); |
- fCoordVaryings.push_back(TransformVarying(*v, uniName, sourceCoords)); |
- } |
- |
- const char* rtAdjustment() const { return "rtAdjustment"; } |
- |
// number of each input/output type in a single allocation block, used by many builders |
static const int kVarsPerBlock; |
@@ -346,7 +331,6 @@ |
const GrProgramDesc& fDesc; |
GrGpuGL* fGpu; |
UniformInfoArray fUniforms; |
- SkSTArray<16, TransformVarying, true> fCoordVaryings; |
friend class GrGLShaderBuilder; |
friend class GrGLVertexBuilder; |