Make GrGLSLPrimitiveProcessor::emitTransforms take local coords as GrShaderVar.
Also remove unused position variable parameter.
Change-Id: I37f98a03ac1ca750810de13b08e3ffa11e41828c
Reviewed-on: https://skia-review.googlesource.com/81320
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
index 70f64ab..5675876 100644
--- a/src/gpu/GrDefaultGeoProcFactory.cpp
+++ b/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -144,8 +144,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- gp.inLocalCoords()->fName,
+ gp.inLocalCoords()->asShaderVar(),
gp.localMatrix(),
args.fFPCoordTransformHandler);
} else {
@@ -153,8 +152,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- gp.inPosition()->fName,
+ gp.inPosition()->asShaderVar(),
gp.localMatrix(),
args.fFPCoordTransformHandler);
}
diff --git a/src/gpu/GrPrimitiveProcessor.h b/src/gpu/GrPrimitiveProcessor.h
index 375b512..f480110 100644
--- a/src/gpu/GrPrimitiveProcessor.h
+++ b/src/gpu/GrPrimitiveProcessor.h
@@ -45,7 +45,10 @@
kPerVertex,
kPerInstance
};
-
+ GrShaderVar asShaderVar() const {
+ return GrShaderVar(fName, GrVertexAttribTypeToSLType(fType),
+ GrShaderVar::kIn_TypeModifier);
+ }
const char* fName;
GrVertexAttribType fType;
int fOffsetInRecord;
diff --git a/src/gpu/ccpr/GrCCPRPathProcessor.cpp b/src/gpu/ccpr/GrCCPRPathProcessor.cpp
index 612035a..be9f67a 100644
--- a/src/gpu/ccpr/GrCCPRPathProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPRPathProcessor.cpp
@@ -172,7 +172,7 @@
proc.getInstanceAttrib(InstanceAttribs::kViewMatrix).fName,
proc.getInstanceAttrib(InstanceAttribs::kViewTranslate).fName);
- this->emitTransforms(v, varyingHandler, uniHandler, gpArgs->fPositionVar, "pathcoord",
+ this->emitTransforms(v, varyingHandler, uniHandler, GrShaderVar("pathcoord", kFloat2_GrSLType),
args.fFPCoordTransformHandler);
// Fragment shader.
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
index ffd7b06..5bc04c8 100644
--- a/src/gpu/effects/GrBezierEffect.cpp
+++ b/src/gpu/effects/GrBezierEffect.cpp
@@ -97,8 +97,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- gp.inPosition()->fName,
+ gp.inPosition()->asShaderVar(),
gp.localMatrix(),
args.fFPCoordTransformHandler);
@@ -350,8 +349,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- gp.inPosition()->fName,
+ gp.inPosition()->asShaderVar(),
gp.localMatrix(),
args.fFPCoordTransformHandler);
@@ -578,11 +576,9 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- gp.inPosition()->fName,
+ gp.inPosition()->asShaderVar(),
args.fFPCoordTransformHandler);
-
GrShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0);
GrShaderVar gF("gF", kFloat2_GrSLType, 0);
GrShaderVar func("func", kFloat_GrSLType, 0);
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index d5f930f..df71f70 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -58,8 +58,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- btgp.inPosition()->fName,
+ btgp.inPosition()->asShaderVar(),
btgp.localMatrix(),
args.fFPCoordTransformHandler);
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
index aafabde..fda2f9d 100644
--- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
@@ -72,8 +72,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- dfTexEffect.inPosition()->fName,
+ dfTexEffect.inPosition()->asShaderVar(),
args.fFPCoordTransformHandler);
// add varyings
@@ -365,8 +364,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- dfTexEffect.inPosition()->fName,
+ dfTexEffect.inPosition()->asShaderVar(),
args.fFPCoordTransformHandler);
} else {
// Setup position
@@ -376,8 +374,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- dfTexEffect.inPosition()->fName,
+ dfTexEffect.inPosition()->asShaderVar(),
dfTexEffect.matrix(),
args.fFPCoordTransformHandler);
}
@@ -633,8 +630,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- dfTexEffect.inPosition()->fName,
+ dfTexEffect.inPosition()->asShaderVar(),
args.fFPCoordTransformHandler);
// set up varyings
diff --git a/src/gpu/effects/GrShadowGeoProc.cpp b/src/gpu/effects/GrShadowGeoProc.cpp
index ba337d7..507101d 100644
--- a/src/gpu/effects/GrShadowGeoProc.cpp
+++ b/src/gpu/effects/GrShadowGeoProc.cpp
@@ -39,8 +39,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- rsgp.inPosition()->fName,
+ rsgp.inPosition()->asShaderVar(),
args.fFPCoordTransformHandler);
fragBuilder->codeAppend("half d = length(shadowParams.xy);");
diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
index 8ee9bbd..01322ed 100644
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.cpp
@@ -43,10 +43,12 @@
void GrGLSLGeometryProcessor::emitTransforms(GrGLSLVertexBuilder* vb,
GrGLSLVaryingHandler* varyingHandler,
GrGLSLUniformHandler* uniformHandler,
- const GrShaderVar& posVar,
- const char* localCoords,
+ const GrShaderVar& localCoordsVar,
const SkMatrix& localMatrix,
FPCoordTransformHandler* handler) {
+ SkASSERT(GrSLTypeIsFloatType(localCoordsVar.getType()));
+ SkASSERT(2 == GrSLTypeVecLength(localCoordsVar.getType()));
+
int i = 0;
while (const GrCoordTransform* coordTransform = handler->nextCoordTransform()) {
SkString strUniName;
@@ -75,9 +77,10 @@
handler->specifyCoordsForCurrCoordTransform(SkString(v.fsIn()), varyingType);
if (kFloat2_GrSLType == varyingType) {
- vb->codeAppendf("%s = (%s * float3(%s, 1)).xy;", v.vsOut(), uniName, localCoords);
+ vb->codeAppendf("%s = (%s * float3(%s, 1)).xy;", v.vsOut(), uniName,
+ localCoordsVar.c_str());
} else {
- vb->codeAppendf("%s = %s * float3(%s, 1);", v.vsOut(), uniName, localCoords);
+ vb->codeAppendf("%s = %s * float3(%s, 1);", v.vsOut(), uniName, localCoordsVar.c_str());
}
++i;
}
diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.h b/src/gpu/glsl/GrGLSLGeometryProcessor.h
index 17a6779..de1e4fd 100644
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.h
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.h
@@ -28,26 +28,25 @@
const GrGLSLProgramDataManager& pdman,
FPCoordTransformIter*);
- // Emit a uniform matrix for each coord transform.
- void emitTransforms(GrGLSLVertexBuilder* vb,
- GrGLSLVaryingHandler* varyingHandler,
- GrGLSLUniformHandler* uniformHandler,
- const GrShaderVar& posVar,
- const char* localCoords,
- FPCoordTransformHandler* handler) {
- this->emitTransforms(vb, varyingHandler, uniformHandler,
- posVar, localCoords, SkMatrix::I(), handler);
- }
-
- // Emit pre-transformed coords as a varying per coord-transform.
+ // Emit transformed local coords from the vertex shader as a uniform matrix and varying per
+ // coord-transform.
void emitTransforms(GrGLSLVertexBuilder*,
GrGLSLVaryingHandler*,
GrGLSLUniformHandler*,
- const GrShaderVar& posVar,
- const char* localCoords,
+ const GrShaderVar& localCoordsVar,
const SkMatrix& localMatrix,
FPCoordTransformHandler*);
+ // Version of above that assumes identity for the local matrix.
+ void emitTransforms(GrGLSLVertexBuilder* vb,
+ GrGLSLVaryingHandler* varyingHandler,
+ GrGLSLUniformHandler* uniformHandler,
+ const GrShaderVar& localCoordsVar,
+ FPCoordTransformHandler* handler) {
+ this->emitTransforms(vb, varyingHandler, uniformHandler, localCoordsVar, SkMatrix::I(),
+ handler);
+ }
+
struct GrGPArgs {
// Used to specify the output variable used by the GP to store its device position. It can
// either be a float2 or a float3 (in order to handle perspective). The subclass sets this
diff --git a/src/gpu/instanced/InstanceProcessor.cpp b/src/gpu/instanced/InstanceProcessor.cpp
index 43dfbef..f99a0db 100644
--- a/src/gpu/instanced/InstanceProcessor.cpp
+++ b/src/gpu/instanced/InstanceProcessor.cpp
@@ -406,7 +406,7 @@
GrGLSLTypeString(args.fShaderCaps, positionType), backend->outShapeCoords());
gpArgs->fPositionVar.set(positionType, "deviceCoords");
- this->emitTransforms(v, varyingHandler, uniHandler, gpArgs->fPositionVar, localCoords,
+ this->emitTransforms(v, varyingHandler, uniHandler, GrShaderVar(localCoords, kHalf2_GrSLType),
args.fFPCoordTransformHandler);
}
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index 3c84b32..b706d68 100644
--- a/src/gpu/ops/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -582,8 +582,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- qe.fInPosition->fName,
+ qe.fInPosition->asShaderVar(),
qe.fLocalMatrix,
args.fFPCoordTransformHandler);
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index e87a335..34c1a2b 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -910,8 +910,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- dce.inPosition()->fName,
+ dce.inPosition()->asShaderVar(),
dce.localMatrix(),
args.fFPCoordTransformHandler);
@@ -1114,8 +1113,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- de.inPosition()->fName,
+ de.inPosition()->asShaderVar(),
de.localMatrix(),
args.fFPCoordTransformHandler);
diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp
index 50741bc..8097b7c 100644
--- a/src/gpu/ops/GrMSAAPathRenderer.cpp
+++ b/src/gpu/ops/GrMSAAPathRenderer.cpp
@@ -149,8 +149,8 @@
qp.viewMatrix(), &fViewMatrixUniform);
// emit transforms
- this->emitTransforms(vsBuilder, varyingHandler, uniformHandler, gpArgs->fPositionVar,
- qp.inPosition()->fName, SkMatrix::I(),
+ this->emitTransforms(vsBuilder, varyingHandler, uniformHandler,
+ qp.inPosition()->asShaderVar(), SkMatrix::I(),
args.fFPCoordTransformHandler);
GrGLSLPPFragmentBuilder* fsBuilder = args.fFragBuilder;
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index a325660..3c4898f 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -144,8 +144,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- cgp.fInPosition->fName,
+ cgp.fInPosition->asShaderVar(),
cgp.fLocalMatrix,
args.fFPCoordTransformHandler);
@@ -293,8 +292,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- egp.fInPosition->fName,
+ egp.fInPosition->asShaderVar(),
egp.fLocalMatrix,
args.fFPCoordTransformHandler);
@@ -437,8 +435,7 @@
this->emitTransforms(vertBuilder,
varyingHandler,
uniformHandler,
- gpArgs->fPositionVar,
- diegp.fInPosition->fName,
+ diegp.fInPosition->asShaderVar(),
args.fFPCoordTransformHandler);
// for outer curve
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index f9600e5..79a22d8 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -107,8 +107,7 @@
this->emitTransforms(args.fVertBuilder,
args.fVaryingHandler,
args.fUniformHandler,
- gpArgs->fPositionVar,
- textureGP.fTextureCoords.fName,
+ textureGP.fTextureCoords.asShaderVar(),
args.fFPCoordTransformHandler);
if (args.fShaderCaps->preferFlatInterpolation()) {
args.fVaryingHandler->addFlatPassThroughAttribute(&textureGP.fColors,