diff options
| author |  egdaniel <egdaniel@google.com> | 2015-11-13 09:55:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-13 09:55:43 -0800 |
| commit | e659a581f63fdccb64dce2dc8a478cf56831feea (patch) | |
| tree | efef38bff117135e343b7b2b192af10b1f2262e3 /src/gpu/GrOvalRenderer.cpp | |
| parent | 60795d99fff8caedc2e82bebcfa8bd4fa07231b7 (diff) | |
Move GrGLPrimitive/GeometryProc to GLSL
BUG=skia:
Review URL: https://codereview.chromium.org/1441683008
Diffstat (limited to 'src/gpu/GrOvalRenderer.cpp')
| -rw-r--r-- | src/gpu/GrOvalRenderer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index ec79a95e5d..3c438d455e 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -21,8 +21,8 @@ #include "SkTLazy.h" #include "batches/GrVertexBatch.h" #include "effects/GrRRectEffect.h" -#include "gl/GrGLGeometryProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLVertexShaderBuilder.h" @@ -90,7 +90,7 @@ public: inline bool isStroked() const { return fStroke; } - class GLProcessor : public GrGLGeometryProcessor { + class GLProcessor : public GrGLSLGeometryProcessor { public: GLProcessor() : fColor(GrColor_ILLEGAL) {} @@ -162,14 +162,14 @@ public: private: GrColor fColor; UniformHandle fColorUniform; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { GLProcessor::GenKey(*this, caps, b); } - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { return new GLProcessor(); } @@ -238,7 +238,7 @@ public: inline bool isStroked() const { return fStroke; } - class GLProcessor : public GrGLGeometryProcessor { + class GLProcessor : public GrGLSLGeometryProcessor { public: GLProcessor() : fColor(GrColor_ILLEGAL) {} @@ -331,14 +331,14 @@ public: GrColor fColor; UniformHandle fColorUniform; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { GLProcessor::GenKey(*this, caps, b); } - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { return new GLProcessor(); } @@ -413,7 +413,7 @@ public: inline Mode getMode() const { return fMode; } - class GLProcessor : public GrGLGeometryProcessor { + class GLProcessor : public GrGLSLGeometryProcessor { public: GLProcessor() : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) {} @@ -525,14 +525,14 @@ public: UniformHandle fColorUniform; UniformHandle fViewMatrixUniform; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { GLProcessor::GenKey(*this, caps, b); } - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override { return new GLProcessor(); } |