From 4dce32c46675efb901618161771d450241af4307 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Wed, 4 Feb 2015 06:25:28 -0800 Subject: Revert "Move DstCopy on gpu into the GrXferProcessor." This reverts commit 74a11753604768bf461b80cabb66060e8564d82c. TBR=joshualitt@google.com,bsalomon@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Committed: https://skia.googlesource.com/skia/+/3e9dfdb3784c0cbfecf7589a74aa9aff7ef40abd Review URL: https://codereview.chromium.org/896163003 --- src/gpu/gl/GrGLXferProcessor.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/gpu/gl/GrGLXferProcessor.h') diff --git a/src/gpu/gl/GrGLXferProcessor.h b/src/gpu/gl/GrGLXferProcessor.h index 7f60f32fe5..5c92559031 100644 --- a/src/gpu/gl/GrGLXferProcessor.h +++ b/src/gpu/gl/GrGLXferProcessor.h @@ -11,7 +11,6 @@ #include "GrGLProcessor.h" class GrGLXPBuilder; -class GrXferProcessor; class GrGLXferProcessor { public: @@ -47,25 +46,16 @@ public: * This is similar to emitCode() in the base class, except it takes a full shader builder. * This allows the effect subclass to emit vertex code. */ - void emitCode(const EmitArgs&); + virtual void emitCode(const EmitArgs&) = 0; /** A GrGLXferProcessor instance can be reused with any GrGLXferProcessor that produces the same stage key; this function reads data from a GrGLXferProcessor and uploads any uniform variables required by the shaders created in emitCode(). The GrXferProcessor parameter is guaranteed to be of the same type that created this GrGLXferProcessor and - to have an identical processor key as the one that created this GrGLXferProcessor. This - function calls onSetData on the subclass of GrGLXferProcessor - */ - void setData(const GrGLProgramDataManager& pdm, const GrXferProcessor& xp); - + to have an identical processor key as the one that created this GrGLXferProcessor. */ + virtual void setData(const GrGLProgramDataManager&, + const GrXferProcessor&) = 0; private: - virtual void onEmitCode(const EmitArgs&) = 0; - - virtual void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) = 0; - - GrGLProgramDataManager::UniformHandle fDstCopyTopLeftUni; - GrGLProgramDataManager::UniformHandle fDstCopyScaleUni; - typedef GrGLProcessor INHERITED; }; #endif -- cgit v1.2.3