Index: src/gpu/gl/builders/GrGLProgramBuilder.h |
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h |
index 69eed27252f9c37cad2588988d6a688659e0d878..1798e604db121bda747bace1d4923b89beb1e28c 100644 |
--- a/src/gpu/gl/builders/GrGLProgramBuilder.h |
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.h |
@@ -14,7 +14,6 @@ |
#include "../GrGLProgramDataManager.h" |
#include "../GrGLUniformHandle.h" |
#include "../GrGLGeometryProcessor.h" |
-#include "../GrGLXferProcessor.h" |
#include "../../GrOptDrawState.h" |
#include "../../GrPendingFragmentStage.h" |
@@ -112,7 +111,6 @@ |
friend class GrGLVertexBuilder; |
friend class GrGLGeometryBuilder; |
- friend class GrGLXferBuilder; |
friend class GrGLFragmentShaderBuilder; |
}; |
@@ -172,18 +170,8 @@ |
*/ |
}; |
-/* a specializations for XPs. Lets the user add uniforms and FS code */ |
-class GrGLXPBuilder : public virtual GrGLUniformBuilder { |
-public: |
- virtual GrGLFPFragmentBuilder* getFragmentShaderBuilder() = 0; |
- |
- /* |
- * *NOTE* NO MEMBERS ALLOWED, MULTIPLE INHERITANCE |
- */ |
-}; |
struct GrGLInstalledProc; |
struct GrGLInstalledGeoProc; |
-struct GrGLInstalledXferProc; |
struct GrGLInstalledFragProc; |
struct GrGLInstalledFragProcs; |
@@ -195,8 +183,7 @@ |
* respective builders |
*/ |
class GrGLProgramBuilder : public GrGLGPBuilder, |
- public GrGLFPBuilder, |
- public GrGLXPBuilder { |
+ public GrGLFPBuilder { |
public: |
/** Generates a shader program. |
* |
@@ -296,12 +283,8 @@ |
void emitAndInstallProc(const GrGeometryProcessor&, |
const char* outColor, |
const char* outCoverage); |
- void emitAndInstallXferProc(const GrXferProcessor&, |
- const GrGLSLExpr4& colorIn, |
- const GrGLSLExpr4& coverageIn); |
void verify(const GrGeometryProcessor&); |
- void verify(const GrXferProcessor&); |
void verify(const GrFragmentProcessor&); |
void emitSamplers(const GrProcessor&, |
GrGLProcessor::TextureSamplerArray* outSamplers, |
@@ -375,7 +358,6 @@ |
int fStageIndex; |
GrGLInstalledGeoProc* fGeometryProcessor; |
- GrGLInstalledXferProc* fXferProcessor; |
SkAutoTUnref<GrGLInstalledFragProcs> fFragmentProcessors; |
const GrOptDrawState& fOptState; |
@@ -407,10 +389,6 @@ |
struct GrGLInstalledGeoProc : public GrGLInstalledProc { |
SkAutoTDelete<GrGLGeometryProcessor> fGLProc; |
-}; |
- |
-struct GrGLInstalledXferProc : public GrGLInstalledProc { |
- SkAutoTDelete<GrGLXferProcessor> fGLProc; |
}; |
struct GrGLInstalledFragProc : public GrGLInstalledProc { |