diff options
Diffstat (limited to 'src/gpu')
21 files changed, 114 insertions, 118 deletions
diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp index 4ce5b0d5fc..6fcec4c6bf 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/GrDefaultGeoProcFactory.cpp @@ -8,8 +8,8 @@ #include "GrDefaultGeoProcFactory.h" #include "GrInvariantOutput.h" -#include "gl/GrGLGeometryProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLVertexShaderBuilder.h" #include "glsl/GrGLSLUtil.h" @@ -56,7 +56,7 @@ public: bool coverageWillBeIgnored() const { return fCoverageWillBeIgnored; } bool hasVertexCoverage() const { return SkToBool(fInCoverage); } - class GLProcessor : public GrGLGeometryProcessor { + class GLProcessor : public GrGLSLGeometryProcessor { public: GLProcessor() : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL), fCoverage(0xff) {} @@ -173,14 +173,14 @@ public: UniformHandle fColorUniform; UniformHandle fCoverageUniform; - 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(); } 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(); } diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp index b83172d46e..f5adfe75d6 100644 --- a/src/gpu/GrPathProcessor.cpp +++ b/src/gpu/GrPathProcessor.cpp @@ -13,7 +13,7 @@ #include "glsl/GrGLSLProcessorTypes.h" #include "glsl/GrGLSLProgramBuilder.h" -class GrGLPathProcessor : public GrGLPrimitiveProcessor { +class GrGLPathProcessor : public GrGLSLPrimitiveProcessor { public: GrGLPathProcessor() : fColor(GrColor_ILLEGAL) {} @@ -111,7 +111,7 @@ private: UniformHandle fColorUniform; GrColor fColor; - typedef GrGLPrimitiveProcessor INHERITED; + typedef GrGLSLPrimitiveProcessor INHERITED; }; GrPathProcessor::GrPathProcessor(GrColor color, @@ -131,7 +131,7 @@ void GrPathProcessor::getGLProcessorKey(const GrGLSLCaps& caps, GrGLPathProcessor::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrPathProcessor::createGLInstance(const GrGLSLCaps& caps) const { +GrGLSLPrimitiveProcessor* GrPathProcessor::createGLInstance(const GrGLSLCaps& caps) const { SkASSERT(caps.pathRenderingSupport()); return new GrGLPathProcessor(); } diff --git a/src/gpu/GrPathProcessor.h b/src/gpu/GrPathProcessor.h index b57f502a86..8b1f1abc9c 100644 --- a/src/gpu/GrPathProcessor.h +++ b/src/gpu/GrPathProcessor.h @@ -34,7 +34,7 @@ public: virtual void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - virtual GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const override; + virtual GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const override; bool hasTransformedLocalCoords() const override { return false; } diff --git a/src/gpu/GrPrimitiveProcessor.h b/src/gpu/GrPrimitiveProcessor.h index 54155a6d5f..e15d2daa9a 100644 --- a/src/gpu/GrPrimitiveProcessor.h +++ b/src/gpu/GrPrimitiveProcessor.h @@ -43,7 +43,7 @@ */ class GrGLSLCaps; -class GrGLPrimitiveProcessor; +class GrGLSLPrimitiveProcessor; struct GrInitInvariantOutput; @@ -197,7 +197,7 @@ public: /** Returns a new instance of the appropriate *GL* implementation class for the given GrProcessor; caller is responsible for deleting the object. */ - virtual GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const = 0; + virtual GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const = 0; bool isPathRendering() const { return fIsPathRendering; } diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp index f0f475e31a..36c1abf786 100644 --- a/src/gpu/batches/GrAAConvexPathRenderer.cpp +++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp @@ -25,7 +25,7 @@ #include "SkString.h" #include "SkTraceEvent.h" #include "batches/GrVertexBatch.h" -#include "gl/GrGLGeometryProcessor.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" @@ -541,7 +541,7 @@ public: const SkMatrix& localMatrix() const { return fLocalMatrix; } bool usesLocalCoords() const { return fUsesLocalCoords; } - class GLProcessor : public GrGLGeometryProcessor { + class GLProcessor : public GrGLSLGeometryProcessor { public: GLProcessor() : fColor(GrColor_ILLEGAL) {} @@ -627,14 +627,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(); } diff --git a/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp index 4585c10214..e6cf035ce6 100644 --- a/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp +++ b/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp @@ -24,8 +24,8 @@ #include "SkTraceEvent.h" #include "SkPathPriv.h" #include "batches/GrVertexBatch.h" -#include "gl/GrGLGeometryProcessor.h" -#include "gl/builders/GrGLProgramBuilder.h" +#include "glsl/GrGLSLGeometryProcessor.h" +#include "glsl/GrGLSLProgramBuilder.h" static const int DEFAULT_BUFFER_SIZE = 100; diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index d57861d29a..57b6ed4512 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -7,13 +7,12 @@ #include "GrBezierEffect.h" -#include "gl/GrGLGeometryProcessor.h" -#include "glsl/GrGLSLFragmentProcessor.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLUtil.h" -class GrGLConicEffect : public GrGLGeometryProcessor { +class GrGLConicEffect : public GrGLSLGeometryProcessor { public: GrGLConicEffect(const GrGeometryProcessor&); @@ -63,7 +62,7 @@ private: UniformHandle fCoverageScaleUniform; UniformHandle fViewMatrixUniform; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; GrGLConicEffect::GrGLConicEffect(const GrGeometryProcessor& processor) @@ -188,7 +187,7 @@ void GrConicEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrGLConicEffect::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrConicEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrConicEffect::createGLInstance(const GrGLSLCaps&) const { return new GrGLConicEffect(*this); } @@ -229,7 +228,7 @@ const GrGeometryProcessor* GrConicEffect::TestCreate(GrProcessorTestData* d) { // Quad ////////////////////////////////////////////////////////////////////////////// -class GrGLQuadEffect : public GrGLGeometryProcessor { +class GrGLQuadEffect : public GrGLSLGeometryProcessor { public: GrGLQuadEffect(const GrGeometryProcessor&); @@ -279,7 +278,7 @@ private: UniformHandle fCoverageScaleUniform; UniformHandle fViewMatrixUniform; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; GrGLQuadEffect::GrGLQuadEffect(const GrGeometryProcessor& processor) @@ -389,7 +388,7 @@ void GrQuadEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrGLQuadEffect::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrQuadEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrQuadEffect::createGLInstance(const GrGLSLCaps&) const { return new GrGLQuadEffect(*this); } @@ -431,7 +430,7 @@ const GrGeometryProcessor* GrQuadEffect::TestCreate(GrProcessorTestData* d) { // Cubic ////////////////////////////////////////////////////////////////////////////// -class GrGLCubicEffect : public GrGLGeometryProcessor { +class GrGLCubicEffect : public GrGLSLGeometryProcessor { public: GrGLCubicEffect(const GrGeometryProcessor&); @@ -467,7 +466,7 @@ private: UniformHandle fColorUniform; UniformHandle fViewMatrixUniform; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; GrGLCubicEffect::GrGLCubicEffect(const GrGeometryProcessor& processor) @@ -605,7 +604,7 @@ void GrCubicEffect::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuil GrGLCubicEffect::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrCubicEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrCubicEffect::createGLInstance(const GrGLSLCaps&) const { return new GrGLCubicEffect(*this); } diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h index 81727d2aee..0f1ee74662 100644 --- a/src/gpu/effects/GrBezierEffect.h +++ b/src/gpu/effects/GrBezierEffect.h @@ -105,7 +105,7 @@ public: void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; private: GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, @@ -185,7 +185,7 @@ public: void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; private: GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimitiveEdgeType, @@ -257,7 +257,7 @@ public: void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; private: GrCubicEffect(GrColor, const SkMatrix& viewMatrix, GrPrimitiveEdgeType); diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 7b179244a1..b9c1c8db83 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -8,14 +8,13 @@ #include "GrBitmapTextGeoProc.h" #include "GrInvariantOutput.h" #include "GrTexture.h" -#include "gl/GrGLGeometryProcessor.h" -#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLVertexShaderBuilder.h" -class GrGLBitmapTextGeoProc : public GrGLGeometryProcessor { +class GrGLBitmapTextGeoProc : public GrGLSLGeometryProcessor { public: GrGLBitmapTextGeoProc() : fColor(GrColor_ILLEGAL) {} @@ -119,7 +118,7 @@ private: GrColor fColor; UniformHandle fColorUniform; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// @@ -151,7 +150,7 @@ void GrBitmapTextGeoProc::getGLProcessorKey(const GrGLSLCaps& caps,GrProcessorKe GrGLBitmapTextGeoProc::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrBitmapTextGeoProc::createGLInstance(const GrGLSLCaps& caps) const { +GrGLSLPrimitiveProcessor* GrBitmapTextGeoProc::createGLInstance(const GrGLSLCaps& caps) const { return new GrGLBitmapTextGeoProc(); } diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h index e9a07bb5b8..ed04dff6d3 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/effects/GrBitmapTextGeoProc.h @@ -43,7 +43,7 @@ public: void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps& caps) const override; private: GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params, diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 612e976f86..c74ae6bebf 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -21,9 +21,8 @@ #include "GrVertexBuffer.h" #include "SkGr.h" #include "batches/GrVertexBatch.h" -#include "gl/GrGLGeometryProcessor.h" -#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLVertexShaderBuilder.h" @@ -793,7 +792,7 @@ public: void getGLProcessorKey(const GrGLSLCaps&, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; private: DashingCircleEffect(GrColor, DashAAMode aaMode, const SkMatrix& localMatrix, @@ -814,7 +813,7 @@ private: ////////////////////////////////////////////////////////////////////////////// -class GLDashingCircleEffect : public GrGLGeometryProcessor { +class GLDashingCircleEffect : public GrGLSLGeometryProcessor { public: GLDashingCircleEffect(); @@ -840,7 +839,7 @@ private: SkScalar fPrevRadius; SkScalar fPrevCenterX; SkScalar fPrevIntervalLength; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; GLDashingCircleEffect::GLDashingCircleEffect() { @@ -934,7 +933,7 @@ void DashingCircleEffect::getGLProcessorKey(const GrGLSLCaps& caps,GrProcessorKe GLDashingCircleEffect::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* DashingCircleEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* DashingCircleEffect::createGLInstance(const GrGLSLCaps&) const { return new GLDashingCircleEffect(); } @@ -1004,7 +1003,7 @@ public: void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; private: DashingLineEffect(GrColor, DashAAMode aaMode, const SkMatrix& localMatrix, @@ -1025,7 +1024,7 @@ private: ////////////////////////////////////////////////////////////////////////////// -class GLDashingLineEffect : public GrGLGeometryProcessor { +class GLDashingLineEffect : public GrGLSLGeometryProcessor { public: GLDashingLineEffect(); @@ -1047,7 +1046,7 @@ public: private: GrColor fColor; UniformHandle fColorUniform; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; GLDashingLineEffect::GLDashingLineEffect() { @@ -1159,7 +1158,7 @@ void DashingLineEffect::getGLProcessorKey(const GrGLSLCaps& caps, GLDashingLineEffect::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* DashingLineEffect::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* DashingLineEffect::createGLInstance(const GrGLSLCaps&) const { return new GLDashingLineEffect(); } diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index a43171a2af..50b4597280 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -11,9 +11,8 @@ #include "SkDistanceFieldGen.h" -#include "gl/GrGLGeometryProcessor.h" -#include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLVertexShaderBuilder.h" @@ -22,7 +21,7 @@ // Assuming a radius of a little less than the diagonal of the fragment #define SK_DistanceFieldAAFactor "0.65" -class GrGLDistanceFieldA8TextGeoProc : public GrGLGeometryProcessor { +class GrGLDistanceFieldA8TextGeoProc : public GrGLSLGeometryProcessor { public: GrGLDistanceFieldA8TextGeoProc() : fViewMatrix(SkMatrix::InvalidMatrix()) @@ -200,7 +199,7 @@ private: UniformHandle fDistanceAdjustUni; #endif - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// @@ -240,7 +239,7 @@ void GrDistanceFieldA8TextGeoProc::getGLProcessorKey(const GrGLSLCaps& caps, GrGLDistanceFieldA8TextGeoProc::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrDistanceFieldA8TextGeoProc::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrDistanceFieldA8TextGeoProc::createGLInstance(const GrGLSLCaps&) const { return new GrGLDistanceFieldA8TextGeoProc(); } @@ -276,7 +275,7 @@ const GrGeometryProcessor* GrDistanceFieldA8TextGeoProc::TestCreate(GrProcessorT /////////////////////////////////////////////////////////////////////////////// -class GrGLDistanceFieldPathGeoProc : public GrGLGeometryProcessor { +class GrGLDistanceFieldPathGeoProc : public GrGLSLGeometryProcessor { public: GrGLDistanceFieldPathGeoProc() : fViewMatrix(SkMatrix::InvalidMatrix()) @@ -422,7 +421,7 @@ private: GrColor fColor; SkISize fTextureSize; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// @@ -457,7 +456,7 @@ void GrDistanceFieldPathGeoProc::getGLProcessorKey(const GrGLSLCaps& caps, GrGLDistanceFieldPathGeoProc::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrDistanceFieldPathGeoProc::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrDistanceFieldPathGeoProc::createGLInstance(const GrGLSLCaps&) const { return new GrGLDistanceFieldPathGeoProc(); } @@ -491,7 +490,7 @@ const GrGeometryProcessor* GrDistanceFieldPathGeoProc::TestCreate(GrProcessorTes /////////////////////////////////////////////////////////////////////////////// -class GrGLDistanceFieldLCDTextGeoProc : public GrGLGeometryProcessor { +class GrGLDistanceFieldLCDTextGeoProc : public GrGLSLGeometryProcessor { public: GrGLDistanceFieldLCDTextGeoProc() : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) { @@ -697,7 +696,7 @@ private: GrDistanceFieldLCDTextGeoProc::DistanceAdjust fDistanceAdjust; UniformHandle fDistanceAdjustUni; - typedef GrGLGeometryProcessor INHERITED; + typedef GrGLSLGeometryProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// @@ -727,7 +726,7 @@ void GrDistanceFieldLCDTextGeoProc::getGLProcessorKey(const GrGLSLCaps& caps, GrGLDistanceFieldLCDTextGeoProc::GenKey(*this, caps, b); } -GrGLPrimitiveProcessor* GrDistanceFieldLCDTextGeoProc::createGLInstance(const GrGLSLCaps&) const { +GrGLSLPrimitiveProcessor* GrDistanceFieldLCDTextGeoProc::createGLInstance(const GrGLSLCaps&) const { return new GrGLDistanceFieldLCDTextGeoProc(); } diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h index ad8cf972f1..20b52c806d 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.h +++ b/src/gpu/effects/GrDistanceFieldGeoProc.h @@ -81,7 +81,7 @@ public: void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; private: GrDistanceFieldA8TextGeoProc(GrColor, const SkMatrix& viewMatrix, @@ -140,7 +140,7 @@ public: void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; private: GrDistanceFieldPathGeoProc(GrColor, const SkMatrix& viewMatrix, GrTexture* texture, @@ -207,7 +207,7 @@ public: void getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override; - GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; + GrGLSLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override; private: GrDistanceFieldLCDTextGeoProc(GrColor, const SkMatrix& viewMatrix, diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 264d307d6a..1fe1d1772a 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -10,13 +10,13 @@ #include "GrAllocator.h" #include "GrProcessor.h" #include "GrCoordTransform.h" -#include "GrGLGeometryProcessor.h" #include "GrGLGpu.h" #include "GrGLPathRendering.h" #include "GrPathProcessor.h" #include "GrPipeline.h" #include "GrXferProcessor.h" #include "glsl/GrGLSLFragmentProcessor.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLXferProcessor.h" #include "SkXfermode.h" @@ -112,7 +112,7 @@ void GrGLProgram::setTransformData(const GrPrimitiveProcessor& primProc, const GrFragmentProcessor& processor, int index, GrGLInstalledFragProc* ip) { - GrGLPrimitiveProcessor* gp = fGeometryProcessor.get()->fGLProc.get(); + GrGLSLPrimitiveProcessor* gp = fGeometryProcessor.get()->fGLProc.get(); gp->setTransformData(primProc, fProgramDataManager, index, processor.coordTransforms()); } diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 8dca667e41..f5108c26af 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -13,13 +13,13 @@ #include "GrTexture.h" #include "SkRTConf.h" #include "SkTraceEvent.h" -#include "gl/GrGLGeometryProcessor.h" #include "gl/GrGLGpu.h" #include "gl/GrGLProgram.h" #include "gl/GrGLSLPrettyPrint.h" #include "gl/builders/GrGLShaderStringBuilder.h" #include "glsl/GrGLSLCaps.h" #include "glsl/GrGLSLFragmentProcessor.h" +#include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLTextureSampler.h" #include "glsl/GrGLSLXferProcessor.h" @@ -153,7 +153,7 @@ const GrGLSLCaps* GrGLProgramBuilder::glslCaps() const { bool GrGLProgramBuilder::emitAndInstallProcs(GrGLSLExpr4* inputColor, GrGLSLExpr4* inputCoverage) { // First we loop over all of the installed processors and collect coord transforms. These will - // be sent to the GrGLPrimitiveProcessor in its emitCode function + // be sent to the GrGLSLPrimitiveProcessor in its emitCode function const GrPrimitiveProcessor& primProc = this->primitiveProcessor(); int totalTextures = primProc.numTextures(); const int maxTextureUnits = fGpu->glCaps().maxFragmentTextureUnits(); @@ -284,7 +284,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrPrimitiveProcessor& gp, SkSTArray<4, GrGLSLTextureSampler> samplers(gp.numTextures()); this->emitSamplers(gp, &samplers, fGeometryProcessor); - GrGLGeometryProcessor::EmitArgs args(this, gp, outColor, outCoverage, samplers, + GrGLSLGeometryProcessor::EmitArgs args(this, gp, outColor, outCoverage, samplers, fCoordTransforms, &fOutCoords); fGeometryProcessor->fGLProc->emitCode(args); diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h index 02fa88688b..3a8dcd8500 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.h +++ b/src/gpu/gl/builders/GrGLProgramBuilder.h @@ -9,8 +9,8 @@ #define GrGLProgramBuilder_DEFINED #include "GrPipeline.h" -#include "gl/GrGLPrimitiveProcessor.h" #include "gl/GrGLProgramDataManager.h" +#include "glsl/GrGLSLPrimitiveProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" #include "glsl/GrGLSLTextureSampler.h" @@ -30,7 +30,7 @@ struct GrGLInstalledProc { SkAutoTDelete<Proc> fGLProc; }; -typedef GrGLInstalledProc<GrGLPrimitiveProcessor> GrGLInstalledGeoProc; +typedef GrGLInstalledProc<GrGLSLPrimitiveProcessor> GrGLInstalledGeoProc; typedef GrGLInstalledProc<GrGLSLXferProcessor> GrGLInstalledXferProc; typedef GrGLInstalledProc<GrGLSLFragmentProcessor> GrGLInstalledFragProc; @@ -176,8 +176,8 @@ private: GrGLGpu* fGpu; UniformInfoArray fUniforms; - GrGLPrimitiveProcessor::TransformsIn fCoordTransforms; - GrGLPrimitiveProcessor::TransformsOut fOutCoords; + GrGLSLPrimitiveProcessor::TransformsIn fCoordTransforms; + GrGLSLPrimitiveProcessor::TransformsOut fOutCoords; SkTArray<UniformHandle> fSamplerUniforms; SeparableVaryingInfoArray fSeparableVaryingInfos; diff --git a/src/gpu/gl/GrGLGeometryProcessor.cpp b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp index de4a5a3263..c9f8c71383 100644 --- a/src/gpu/gl/GrGLGeometryProcessor.cpp +++ b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp @@ -5,26 +5,26 @@ * found in the LICENSE file. */ -#include "GrGLGeometryProcessor.h" +#include "GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProcessorTypes.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLVertexShaderBuilder.h" -void GrGLGeometryProcessor::emitCode(EmitArgs& args) { +void GrGLSLGeometryProcessor::emitCode(EmitArgs& args) { GrGLSLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); GrGPArgs gpArgs; this->onEmitCode(args, &gpArgs); vsBuilder->transformToNormalizedDeviceSpace(gpArgs.fPositionVar); } -void GrGLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb, - const GrShaderVar& posVar, - const char* localCoords, - const SkMatrix& localMatrix, - const TransformsIn& tin, - TransformsOut* tout) { +void GrGLSLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb, + const GrShaderVar& posVar, + const char* localCoords, + const SkMatrix& localMatrix, + const TransformsIn& tin, + TransformsOut* tout) { GrGLSLVertexBuilder* vb = pb->getVertexShaderBuilder(); tout->push_back_n(tin.count()); fInstalledTransforms.push_back_n(tin.count()); @@ -92,10 +92,10 @@ void GrGLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb, } } -void GrGLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb, - const char* localCoords, - const TransformsIn& tin, - TransformsOut* tout) { +void GrGLSLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb, + const char* localCoords, + const TransformsIn& tin, + TransformsOut* tout) { GrGLSLVertexBuilder* vb = pb->getVertexShaderBuilder(); tout->push_back_n(tin.count()); for (int i = 0; i < tin.count(); i++) { @@ -121,19 +121,19 @@ void GrGLGeometryProcessor::emitTransforms(GrGLSLGPBuilder* pb, } } -void GrGLGeometryProcessor::setupPosition(GrGLSLGPBuilder* pb, - GrGPArgs* gpArgs, - const char* posName) { +void GrGLSLGeometryProcessor::setupPosition(GrGLSLGPBuilder* pb, + GrGPArgs* gpArgs, + const char* posName) { GrGLSLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2"); vsBuilder->codeAppendf("vec2 %s = %s;", gpArgs->fPositionVar.c_str(), posName); } -void GrGLGeometryProcessor::setupPosition(GrGLSLGPBuilder* pb, - GrGPArgs* gpArgs, - const char* posName, - const SkMatrix& mat, - UniformHandle* viewMatrixUniform) { +void GrGLSLGeometryProcessor::setupPosition(GrGLSLGPBuilder* pb, + GrGPArgs* gpArgs, + const char* posName, + const SkMatrix& mat, + UniformHandle* viewMatrixUniform) { GrGLSLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); if (mat.isIdentity()) { gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2"); diff --git a/src/gpu/gl/GrGLGeometryProcessor.h b/src/gpu/glsl/GrGLSLGeometryProcessor.h index 8151c32eef..1064eb02c2 100644 --- a/src/gpu/gl/GrGLGeometryProcessor.h +++ b/src/gpu/glsl/GrGLSLGeometryProcessor.h @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#ifndef GrGLGeometryProcessor_DEFINED -#define GrGLGeometryProcessor_DEFINED +#ifndef GrGLSLGeometryProcessor_DEFINED +#define GrGLSLGeometryProcessor_DEFINED -#include "GrGLPrimitiveProcessor.h" +#include "GrGLSLPrimitiveProcessor.h" class GrGLSLGPBuilder; @@ -17,7 +17,7 @@ class GrGLSLGPBuilder; * from this class. Since paths don't have vertices, this class is only meant to be used internally * by skia, for special cases. */ -class GrGLGeometryProcessor : public GrGLPrimitiveProcessor { +class GrGLSLGeometryProcessor : public GrGLSLPrimitiveProcessor { public: /* Any general emit code goes in the base class emitCode. Subclasses override onEmitCode */ void emitCode(EmitArgs&) override; @@ -104,7 +104,7 @@ private: virtual void onEmitCode(EmitArgs&, GrGPArgs*) = 0; - typedef GrGLPrimitiveProcessor INHERITED; + typedef GrGLSLPrimitiveProcessor INHERITED; }; #endif diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.cpp b/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp index 66d3892559..abb3abcb0d 100644 --- a/src/gpu/gl/GrGLPrimitiveProcessor.cpp +++ b/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "GrGLPrimitiveProcessor.h" +#include "GrGLSLPrimitiveProcessor.h" #include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" -SkMatrix GrGLPrimitiveProcessor::GetTransformMatrix(const SkMatrix& localMatrix, - const GrCoordTransform& coordTransform) { +SkMatrix GrGLSLPrimitiveProcessor::GetTransformMatrix(const SkMatrix& localMatrix, + const GrCoordTransform& coordTransform) { SkMatrix combined; // We only apply the localmatrix to localcoords if (kLocal_GrCoordSet == coordTransform.sourceCoords()) { @@ -32,9 +32,9 @@ SkMatrix GrGLPrimitiveProcessor::GetTransformMatrix(const SkMatrix& localMatrix, return combined; } -void GrGLPrimitiveProcessor::setupUniformColor(GrGLSLGPBuilder* pb, - const char* outputName, - UniformHandle* colorUniform) { +void GrGLSLPrimitiveProcessor::setupUniformColor(GrGLSLGPBuilder* pb, + const char* outputName, + UniformHandle* colorUniform) { GrGLSLFragmentBuilder* fs = pb->getFragmentShaderBuilder(); SkASSERT(colorUniform); const char* stagedLocalVarName; diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.h b/src/gpu/glsl/GrGLSLPrimitiveProcessor.h index 0f3c42e525..537aaed8f2 100644 --- a/src/gpu/gl/GrGLPrimitiveProcessor.h +++ b/src/gpu/glsl/GrGLSLPrimitiveProcessor.h @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#ifndef GrGLPrimitiveProcessor_DEFINED -#define GrGLPrimitiveProcessor_DEFINED +#ifndef GrGLSLPrimitiveProcessor_DEFINED +#define GrGLSLPrimitiveProcessor_DEFINED #include "GrPrimitiveProcessor.h" #include "glsl/GrGLSLProcessorTypes.h" @@ -17,9 +17,9 @@ class GrBatchTracker; class GrPrimitiveProcessor; class GrGLSLGPBuilder; -class GrGLPrimitiveProcessor { +class GrGLSLPrimitiveProcessor { public: - virtual ~GrGLPrimitiveProcessor() {} + virtual ~GrGLSLPrimitiveProcessor() {} typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; typedef GrGLSLTextureSampler::TextureSamplerArray TextureSamplerArray; @@ -59,12 +59,12 @@ public: virtual void emitCode(EmitArgs&) = 0; - /** A GrGLPrimitiveProcessor instance can be reused with any GrGLPrimitiveProcessor that - produces the same stage key; this function reads data from a GrGLPrimitiveProcessor and + /** A GrGLSLPrimitiveProcessor instance can be reused with any GrGLSLPrimitiveProcessor that + produces the same stage key; this function reads data from a GrGLSLPrimitiveProcessor and uploads any uniform variables required by the shaders created in emitCode(). The GrPrimitiveProcessor parameter is guaranteed to be of the same type that created this - GrGLPrimitiveProcessor and to have an identical processor key as the one that created this - GrGLPrimitiveProcessor. */ + GrGLSLPrimitiveProcessor and to have an identical processor key as the one that created this + GrGLSLPrimitiveProcessor. */ virtual void setData(const GrGLSLProgramDataManager&, const GrPrimitiveProcessor&) = 0; static SkMatrix GetTransformMatrix(const SkMatrix& localMatrix, const GrCoordTransform&); |