aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/effects
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu/effects')
-rw-r--r--src/gpu/effects/GrBezierEffect.cpp12
-rw-r--r--src/gpu/effects/GrBezierEffect.h24
-rw-r--r--src/gpu/effects/GrBitmapTextGeoProc.cpp6
-rw-r--r--src/gpu/effects/GrBitmapTextGeoProc.h12
-rw-r--r--src/gpu/effects/GrDashingEffect.cpp24
-rwxr-xr-xsrc/gpu/effects/GrDistanceFieldTextureEffect.cpp16
-rw-r--r--src/gpu/effects/GrDistanceFieldTextureEffect.h32
7 files changed, 63 insertions, 63 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
index f674345728..b8e4c0cb18 100644
--- a/src/gpu/effects/GrBezierEffect.cpp
+++ b/src/gpu/effects/GrBezierEffect.cpp
@@ -198,8 +198,8 @@ GrConicEffect::GrConicEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t
, fCoverageScale(coverage)
, fEdgeType(edgeType) {
this->initClassID<GrConicEffect>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
- fInConicCoeffs = &this->addVertexAttrib(GrAttribute("inConicCoeffs",
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+ fInConicCoeffs = &this->addVertexAttrib(Attribute("inConicCoeffs",
kVec4f_GrVertexAttribType));
}
@@ -422,8 +422,8 @@ GrQuadEffect::GrQuadEffect(GrColor color, const SkMatrix& viewMatrix, uint8_t co
, fCoverageScale(coverage)
, fEdgeType(edgeType) {
this->initClassID<GrQuadEffect>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
- fInHairQuadEdge = &this->addVertexAttrib(GrAttribute("inHairQuadEdge",
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+ fInHairQuadEdge = &this->addVertexAttrib(Attribute("inHairQuadEdge",
kVec4f_GrVertexAttribType));
}
@@ -667,8 +667,8 @@ GrCubicEffect::GrCubicEffect(GrColor color, const SkMatrix& viewMatrix,
GrPrimitiveEdgeType edgeType)
: INHERITED(color, viewMatrix), fEdgeType(edgeType) {
this->initClassID<GrCubicEffect>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
- fInCubicCoeffs = &this->addVertexAttrib(GrAttribute("inCubicCoeffs",
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+ fInCubicCoeffs = &this->addVertexAttrib(Attribute("inCubicCoeffs",
kVec4f_GrVertexAttribType));
}
diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
index 86f09bc58d..020286fddb 100644
--- a/src/gpu/effects/GrBezierEffect.h
+++ b/src/gpu/effects/GrBezierEffect.h
@@ -92,8 +92,8 @@ public:
const char* name() const SK_OVERRIDE { return "Conic"; }
- inline const GrAttribute* inPosition() const { return fInPosition; }
- inline const GrAttribute* inConicCoeffs() const { return fInConicCoeffs; }
+ inline const Attribute* inPosition() const { return fInPosition; }
+ inline const Attribute* inConicCoeffs() const { return fInConicCoeffs; }
inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -122,8 +122,8 @@ private:
uint8_t fCoverageScale;
GrPrimitiveEdgeType fEdgeType;
- const GrAttribute* fInPosition;
- const GrAttribute* fInConicCoeffs;
+ const Attribute* fInPosition;
+ const Attribute* fInConicCoeffs;
GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
@@ -177,8 +177,8 @@ public:
const char* name() const SK_OVERRIDE { return "Quad"; }
- inline const GrAttribute* inPosition() const { return fInPosition; }
- inline const GrAttribute* inHairQuadEdge() const { return fInHairQuadEdge; }
+ inline const Attribute* inPosition() const { return fInPosition; }
+ inline const Attribute* inHairQuadEdge() const { return fInHairQuadEdge; }
inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -207,8 +207,8 @@ private:
uint8_t fCoverageScale;
GrPrimitiveEdgeType fEdgeType;
- const GrAttribute* fInPosition;
- const GrAttribute* fInHairQuadEdge;
+ const Attribute* fInPosition;
+ const Attribute* fInHairQuadEdge;
GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
@@ -258,8 +258,8 @@ public:
const char* name() const SK_OVERRIDE { return "Cubic"; }
- inline const GrAttribute* inPosition() const { return fInPosition; }
- inline const GrAttribute* inCubicCoeffs() const { return fInCubicCoeffs; }
+ inline const Attribute* inPosition() const { return fInPosition; }
+ inline const Attribute* inCubicCoeffs() const { return fInCubicCoeffs; }
inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType); }
inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -286,8 +286,8 @@ private:
}
GrPrimitiveEdgeType fEdgeType;
- const GrAttribute* fInPosition;
- const GrAttribute* fInCubicCoeffs;
+ const Attribute* fInPosition;
+ const Attribute* fInCubicCoeffs;
GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 0818fc0d8c..146fb0672f 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -105,12 +105,12 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, GrTexture* texture,
, fTextureAccess(texture, params)
, fInColor(NULL) {
this->initClassID<GrBitmapTextGeoProc>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
if (useColorAttrib) {
- fInColor = &this->addVertexAttrib(GrAttribute("inColor", kVec4ub_GrVertexAttribType));
+ fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
this->setHasVertexColor();
}
- fInTextureCoords = &this->addVertexAttrib(GrAttribute("inTextureCoords",
+ fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
kVec2f_GrVertexAttribType));
this->addTextureAccess(&fTextureAccess);
}
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
index 399678ab2a..d73fba83e5 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.h
+++ b/src/gpu/effects/GrBitmapTextGeoProc.h
@@ -32,9 +32,9 @@ public:
const char* name() const SK_OVERRIDE { return "Texture"; }
- const GrAttribute* inPosition() const { return fInPosition; }
- const GrAttribute* inColor() const { return fInColor; }
- const GrAttribute* inTextureCoords() const { return fInTextureCoords; }
+ const Attribute* inPosition() const { return fInPosition; }
+ const Attribute* inColor() const { return fInColor; }
+ const Attribute* inTextureCoords() const { return fInTextureCoords; }
virtual void getGLProcessorKey(const GrBatchTracker& bt,
const GrGLCaps& caps,
@@ -57,9 +57,9 @@ private:
void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrTextureAccess fTextureAccess;
- const GrAttribute* fInPosition;
- const GrAttribute* fInColor;
- const GrAttribute* fInTextureCoords;
+ const Attribute* fInPosition;
+ const Attribute* fInColor;
+ const Attribute* fInTextureCoords;
GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
index 2543145c20..7016ef203e 100644
--- a/src/gpu/effects/GrDashingEffect.cpp
+++ b/src/gpu/effects/GrDashingEffect.cpp
@@ -480,9 +480,9 @@ public:
const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; }
- const GrAttribute* inPosition() const { return fInPosition; }
+ const Attribute* inPosition() const { return fInPosition; }
- const GrAttribute* inCoord() const { return fInCoord; }
+ const Attribute* inCoord() const { return fInCoord; }
GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -514,8 +514,8 @@ private:
void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrPrimitiveEdgeType fEdgeType;
- const GrAttribute* fInPosition;
- const GrAttribute* fInCoord;
+ const Attribute* fInPosition;
+ const Attribute* fInCoord;
SkScalar fIntervalLength;
SkScalar fRadius;
SkScalar fCenterX;
@@ -685,8 +685,8 @@ DashingCircleEffect::DashingCircleEffect(GrColor color,
const SkMatrix& localMatrix)
: INHERITED(color, SkMatrix::I(), localMatrix), fEdgeType(edgeType) {
this->initClassID<DashingCircleEffect>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
- fInCoord = &this->addVertexAttrib(GrAttribute("inCoord", kVec2f_GrVertexAttribType));
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+ fInCoord = &this->addVertexAttrib(Attribute("inCoord", kVec2f_GrVertexAttribType));
SkScalar onLen = info.fIntervals[0];
SkScalar offLen = info.fIntervals[1];
fIntervalLength = onLen + offLen;
@@ -774,9 +774,9 @@ public:
const char* name() const SK_OVERRIDE { return "DashingEffect"; }
- const GrAttribute* inPosition() const { return fInPosition; }
+ const Attribute* inPosition() const { return fInPosition; }
- const GrAttribute* inCoord() const { return fInCoord; }
+ const Attribute* inCoord() const { return fInCoord; }
GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
@@ -806,8 +806,8 @@ private:
void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;
GrPrimitiveEdgeType fEdgeType;
- const GrAttribute* fInPosition;
- const GrAttribute* fInCoord;
+ const Attribute* fInPosition;
+ const Attribute* fInCoord;
SkRect fRect;
SkScalar fIntervalLength;
@@ -990,8 +990,8 @@ DashingLineEffect::DashingLineEffect(GrColor color,
const SkMatrix& localMatrix)
: INHERITED(color, SkMatrix::I(), localMatrix), fEdgeType(edgeType) {
this->initClassID<DashingLineEffect>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
- fInCoord = &this->addVertexAttrib(GrAttribute("inCoord", kVec2f_GrVertexAttribType));
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+ fInCoord = &this->addVertexAttrib(Attribute("inCoord", kVec2f_GrVertexAttribType));
SkScalar onLen = info.fIntervals[0];
SkScalar offLen = info.fIntervals[1];
SkScalar halfOffLen = SkScalarHalf(offLen);
diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
index 24fe001b06..00713d6351 100755
--- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
@@ -212,12 +212,12 @@ GrDistanceFieldTextureEffect::GrDistanceFieldTextureEffect(GrColor color,
, fInColor(NULL) {
SkASSERT(!(flags & ~kNonLCD_DistanceFieldEffectMask));
this->initClassID<GrDistanceFieldTextureEffect>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
if (flags & kColorAttr_DistanceFieldEffectFlag) {
- fInColor = &this->addVertexAttrib(GrAttribute("inColor", kVec4ub_GrVertexAttribType));
+ fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
this->setHasVertexColor();
}
- fInTextureCoords = &this->addVertexAttrib(GrAttribute("inTextureCoords",
+ fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
kVec2f_GrVertexAttribType));
this->addTextureAccess(&fTextureAccess);
#ifdef SK_GAMMA_APPLY_TO_A8
@@ -472,12 +472,12 @@ GrDistanceFieldNoGammaTextureEffect::GrDistanceFieldNoGammaTextureEffect(
, fInColor(NULL) {
SkASSERT(!(flags & ~kNonLCD_DistanceFieldEffectMask));
this->initClassID<GrDistanceFieldNoGammaTextureEffect>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
if (flags & kColorAttr_DistanceFieldEffectFlag) {
- fInColor = &this->addVertexAttrib(GrAttribute("inColor", kVec4ub_GrVertexAttribType));
+ fInColor = &this->addVertexAttrib(Attribute("inColor", kVec4ub_GrVertexAttribType));
this->setHasVertexColor();
}
- fInTextureCoords = &this->addVertexAttrib(GrAttribute("inTextureCoords",
+ fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
kVec2f_GrVertexAttribType));
this->addTextureAccess(&fTextureAccess);
}
@@ -789,8 +789,8 @@ GrDistanceFieldLCDTextureEffect::GrDistanceFieldLCDTextureEffect(
, fFlags(flags & kLCD_DistanceFieldEffectMask){
SkASSERT(!(flags & ~kLCD_DistanceFieldEffectMask) && (flags & kUseLCD_DistanceFieldEffectFlag));
this->initClassID<GrDistanceFieldLCDTextureEffect>();
- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
- fInTextureCoords = &this->addVertexAttrib(GrAttribute("inTextureCoords",
+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));
+ fInTextureCoords = &this->addVertexAttrib(Attribute("inTextureCoords",
kVec2f_GrVertexAttribType));
this->addTextureAccess(&fTextureAccess);
this->addTextureAccess(&fGammaTextureAccess);
diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h
index 2fb448b463..5a99d24fb1 100644
--- a/src/gpu/effects/GrDistanceFieldTextureEffect.h
+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h
@@ -68,9 +68,9 @@ public:
const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; }
- const GrAttribute* inPosition() const { return fInPosition; }
- const GrAttribute* inColor() const { return fInColor; }
- const GrAttribute* inTextureCoords() const { return fInTextureCoords; }
+ const Attribute* inPosition() const { return fInPosition; }
+ const Attribute* inColor() const { return fInColor; }
+ const Attribute* inTextureCoords() const { return fInTextureCoords; }
#ifdef SK_GAMMA_APPLY_TO_A8
float getLuminance() const { return fLuminance; }
#endif
@@ -107,9 +107,9 @@ private:
float fLuminance;
#endif
uint32_t fFlags;
- const GrAttribute* fInPosition;
- const GrAttribute* fInColor;
- const GrAttribute* fInTextureCoords;
+ const Attribute* fInPosition;
+ const Attribute* fInColor;
+ const Attribute* fInTextureCoords;
GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
@@ -136,9 +136,9 @@ public:
const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; }
- const GrAttribute* inPosition() const { return fInPosition; }
- const GrAttribute* inColor() const { return fInColor; }
- const GrAttribute* inTextureCoords() const { return fInTextureCoords; }
+ const Attribute* inPosition() const { return fInPosition; }
+ const Attribute* inColor() const { return fInColor; }
+ const Attribute* inTextureCoords() const { return fInTextureCoords; }
uint32_t getFlags() const { return fFlags; }
virtual void getGLProcessorKey(const GrBatchTracker& bt,
@@ -165,9 +165,9 @@ private:
GrTextureAccess fTextureAccess;
uint32_t fFlags;
- const GrAttribute* fInPosition;
- const GrAttribute* fInColor;
- const GrAttribute* fInTextureCoords;
+ const Attribute* fInPosition;
+ const Attribute* fInColor;
+ const Attribute* fInTextureCoords;
GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
@@ -194,8 +194,8 @@ public:
const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; }
- const GrAttribute* inPosition() const { return fInPosition; }
- const GrAttribute* inTextureCoords() const { return fInTextureCoords; }
+ const Attribute* inPosition() const { return fInPosition; }
+ const Attribute* inTextureCoords() const { return fInTextureCoords; }
GrColor getTextColor() const { return fTextColor; }
uint32_t getFlags() const { return fFlags; }
@@ -226,8 +226,8 @@ private:
GrTextureAccess fGammaTextureAccess;
GrColor fTextColor;
uint32_t fFlags;
- const GrAttribute* fInPosition;
- const GrAttribute* fInTextureCoords;
+ const Attribute* fInPosition;
+ const Attribute* fInTextureCoords;
GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 08:04:44 +0000