Index: src/gpu/gl/GrGLProgram.cpp |
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp |
index da687c1eb6e5c84db74832be88e00b105d9d702e..29c44ac56ccb9e92181b4b254c999857f325dadb 100644 |
--- a/src/gpu/gl/GrGLProgram.cpp |
+++ b/src/gpu/gl/GrGLProgram.cpp |
@@ -12,13 +12,11 @@ |
#include "GrCoordTransform.h" |
#include "GrGLGeometryProcessor.h" |
#include "GrGLProcessor.h" |
-#include "GrGLXferProcessor.h" |
#include "GrGpuGL.h" |
#include "GrGLPathRendering.h" |
#include "GrGLShaderVar.h" |
#include "GrGLSL.h" |
#include "GrOptDrawState.h" |
-#include "GrXferProcessor.h" |
#include "SkXfermode.h" |
#define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) |
@@ -59,7 +57,6 @@ |
GrGLuint programID, |
const UniformInfoArray& uniforms, |
GrGLInstalledGeoProc* geometryProcessor, |
- GrGLInstalledXferProc* xferProcessor, |
GrGLInstalledFragProcs* fragmentProcessors) |
: fColor(GrColor_ILLEGAL) |
, fCoverage(0) |
@@ -67,7 +64,6 @@ |
, fBuiltinUniformHandles(builtinUniforms) |
, fProgramID(programID) |
, fGeometryProcessor(geometryProcessor) |
- , fXferProcessor(xferProcessor) |
, fFragmentProcessors(SkRef(fragmentProcessors)) |
, fDesc(desc) |
, fGpu(gpu) |
@@ -94,9 +90,6 @@ |
} |
if (fGeometryProcessor.get()) { |
this->initSamplers(fGeometryProcessor.get(), &texUnitIdx); |
- } |
- if (fXferProcessor.get()) { |
- this->initSamplers(fXferProcessor.get(), &texUnitIdx); |
} |
int numProcs = fFragmentProcessors->fProcs.count(); |
for (int i = 0; i < numProcs; i++) { |
@@ -169,11 +162,6 @@ |
fGeometryProcessor->fGLProc->setData(fProgramDataManager, gp, bt); |
this->bindTextures(fGeometryProcessor, gp); |
} |
- if (fXferProcessor.get()) { |
- const GrXferProcessor& xp = *optState.getXferProcessor(); |
- fXferProcessor->fGLProc->setData(fProgramDataManager, xp); |
- this->bindTextures(fXferProcessor, xp); |
- } |
this->setFragmentData(optState); |
// Some of GrGLProgram subclasses need to update state here |
@@ -296,10 +284,8 @@ |
const BuiltinUniformHandles& builtinUniforms, |
GrGLuint programID, |
const UniformInfoArray& uniforms, |
- GrGLInstalledXferProc* xferProcessor, |
GrGLInstalledFragProcs* fragmentProcessors) |
- : INHERITED(gpu, desc, builtinUniforms, programID, uniforms, NULL, |
- xferProcessor, fragmentProcessors) { |
+ : INHERITED(gpu, desc, builtinUniforms, programID, uniforms, NULL, fragmentProcessors) { |
} |
void GrGLNvprProgramBase::onSetMatrixAndRenderTargetHeight(const GrOptDrawState& optState) { |
@@ -317,11 +303,9 @@ |
const BuiltinUniformHandles& builtinUniforms, |
GrGLuint programID, |
const UniformInfoArray& uniforms, |
- GrGLInstalledXferProc* xferProcessor, |
GrGLInstalledFragProcs* fragmentProcessors, |
const SeparableVaryingInfoArray& separableVaryings) |
- : INHERITED(gpu, desc, builtinUniforms, programID, uniforms, |
- xferProcessor, fragmentProcessors) { |
+ : INHERITED(gpu, desc, builtinUniforms, programID, uniforms, fragmentProcessors) { |
int count = separableVaryings.count(); |
fVaryings.push_back_n(count); |
for (int i = 0; i < count; i++) { |
@@ -369,10 +353,9 @@ |
const BuiltinUniformHandles& builtinUniforms, |
GrGLuint programID, |
const UniformInfoArray& uniforms, |
- GrGLInstalledXferProc* xp, |
GrGLInstalledFragProcs* fps, |
int texCoordSetCnt) |
- : INHERITED(gpu, desc, builtinUniforms, programID, uniforms, xp, fps) |
+ : INHERITED(gpu, desc, builtinUniforms, programID, uniforms, fps) |
, fTexCoordSetCnt(texCoordSetCnt) { |
} |