diff options
author | joshualitt <joshualitt@chromium.org> | 2015-05-21 15:50:36 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-21 15:50:36 -0700 |
commit | 5559ca2a18687ef16b2fc92d8fcacbc1c3e93d54 (patch) | |
tree | 49221a180f2c80608d8f9517e3b31c50d60c0df7 /src/gpu/gl/GrGLPrimitiveProcessor.h | |
parent | 160d08cb01a395e584a767b00f45e7fcf996b890 (diff) |
Remove uniform view matrix from GrGLPrimitiveProcessor base class
BUG=skia:
Review URL: https://codereview.chromium.org/1151693005
Diffstat (limited to 'src/gpu/gl/GrGLPrimitiveProcessor.h')
-rw-r--r-- | src/gpu/gl/GrGLPrimitiveProcessor.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.h b/src/gpu/gl/GrGLPrimitiveProcessor.h index 90ee2038f8..7345eae35b 100644 --- a/src/gpu/gl/GrGLPrimitiveProcessor.h +++ b/src/gpu/gl/GrGLPrimitiveProcessor.h @@ -17,7 +17,6 @@ class GrGLGPBuilder; class GrGLPrimitiveProcessor { public: - GrGLPrimitiveProcessor() : fViewMatrixName(NULL) { fViewMatrix = SkMatrix::InvalidMatrix(); } virtual ~GrGLPrimitiveProcessor() {} typedef GrGLProgramDataManager::UniformHandle UniformHandle; @@ -76,18 +75,6 @@ public: protected: void setupUniformColor(GrGLGPBuilder* pb, const char* outputName, UniformHandle* colorUniform); - const char* uViewM() const { return fViewMatrixName; } - - /** a helper function to setup the uniform handle for the uniform view matrix */ - void addUniformViewMatrix(GrGLGPBuilder*); - - - /** a helper function to upload a uniform viewmatrix. - * TODO we can remove this function when we have deferred geometry in place - */ - void setUniformViewMatrix(const GrGLProgramDataManager&, - const SkMatrix& viewMatrix); - class ShaderVarHandle { public: bool isValid() const { return fHandle > -1; } @@ -111,11 +98,6 @@ protected: }; SkSTArray<8, SkSTArray<2, Transform, true> > fInstalledTransforms; - -private: - UniformHandle fViewMatrixUniform; - SkMatrix fViewMatrix; - const char* fViewMatrixName; }; #endif |