AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor cleanup of GP classes in GrOvalRenderer

Browse Source 
Move GLSL nested classes to private and remove unnecessary public getters.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2253903002

Review-Url: https://codereview.chromium.org/2253903002
This commit is contained in:
bsalomon 2016-08-17 09:00:24 -07:00 committed by Commit bot
parent 549ca329cf
commit 31df31c12f
1 changed files with 48 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/gpu/GrOvalRenderer.cpp
View File

@ -91,15 +91,21 @@ public:
bool implementsDistanceVector() const override { return true; }; bool implementsDistanceVector() const override { return true; };
const Attribute* inPosition() const { return fInPosition; }
const Attribute* inColor() const { return fInColor; }
const Attribute* inCircleEdge() const { return fInCircleEdge; }
const SkMatrix& localMatrix() const { return fLocalMatrix; } const SkMatrix& localMatrix() const { return fLocalMatrix; }
virtual ~CircleGeometryProcessor() {} virtual ~CircleGeometryProcessor() {}
const char* name() const override { return "CircleEdge"; } const char* name() const override { return "CircleEdge"; }
void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
GLSLProcessor::GenKey(*this, caps, b);
}
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
return new GLSLProcessor();
}
private:
class GLSLProcessor : public GrGLSLGeometryProcessor { class GLSLProcessor : public GrGLSLGeometryProcessor {
public: public:
GLSLProcessor() {} GLSLProcessor() {}
@ -115,22 +121,22 @@ public:
GrGLSLVertToFrag v(kVec4f_GrSLType); GrGLSLVertToFrag v(kVec4f_GrSLType);
varyingHandler->addVarying("CircleEdge", &v); varyingHandler->addVarying("CircleEdge", &v);
vertBuilder->codeAppendf("%s = %s;", v.vsOut(), cgp.inCircleEdge()->fName); vertBuilder->codeAppendf("%s = %s;", v.vsOut(), cgp.fInCircleEdge->fName);
GrGLSLPPFragmentBuilder* fragBuilder = args.fFragBuilder; GrGLSLPPFragmentBuilder* fragBuilder = args.fFragBuilder;
// setup pass through color // setup pass through color
varyingHandler->addPassThroughAttribute(cgp.inColor(), args.fOutputColor); varyingHandler->addPassThroughAttribute(cgp.fInColor, args.fOutputColor);
// Setup position // Setup position
this->setupPosition(vertBuilder, gpArgs, cgp.inPosition()->fName); this->setupPosition(vertBuilder, gpArgs, cgp.fInPosition->fName);
// emit transforms // emit transforms
this->emitTransforms(vertBuilder, this->emitTransforms(vertBuilder,
varyingHandler, varyingHandler,
uniformHandler, uniformHandler,
gpArgs->fPositionVar, gpArgs->fPositionVar,
cgp.inPosition()->fName, cgp.fInPosition->fName,
cgp.localMatrix(), cgp.fLocalMatrix,
args.fTransformsIn, args.fTransformsIn,
args.fTransformsOut); args.fTransformsOut);
@ -166,7 +172,7 @@ public:
GrProcessorKeyBuilder* b) { GrProcessorKeyBuilder* b) {
const CircleGeometryProcessor& cgp = gp.cast<CircleGeometryProcessor>(); const CircleGeometryProcessor& cgp = gp.cast<CircleGeometryProcessor>();
uint16_t key = cgp.fStroke ? 0x1 : 0x0; uint16_t key = cgp.fStroke ? 0x1 : 0x0;
key |= cgp.localMatrix().hasPerspective() ? 0x2 : 0x0; key |= cgp.fLocalMatrix.hasPerspective() ? 0x2 : 0x0;
b->add32(key); b->add32(key);
} }
@ -186,15 +192,6 @@ public:
typedef GrGLSLGeometryProcessor INHERITED; typedef GrGLSLGeometryProcessor INHERITED;
}; };
void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
GLSLProcessor::GenKey(*this, caps, b);
}
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
return new GLSLProcessor();
}
private:
SkMatrix fLocalMatrix; SkMatrix fLocalMatrix;
const Attribute* fInPosition; const Attribute* fInPosition;
const Attribute* fInColor; const Attribute* fInColor;
@ -241,12 +238,17 @@ public:
const char* name() const override { return "EllipseEdge"; } const char* name() const override { return "EllipseEdge"; }
const Attribute* inPosition() const { return fInPosition; }
const Attribute* inColor() const { return fInColor; }
const Attribute* inEllipseOffset() const { return fInEllipseOffset; }
const Attribute* inEllipseRadii() const { return fInEllipseRadii; }
const SkMatrix& localMatrix() const { return fLocalMatrix; } const SkMatrix& localMatrix() const { return fLocalMatrix; }
void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
GLSLProcessor::GenKey(*this, caps, b);
}
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
return new GLSLProcessor();
}
private:
class GLSLProcessor : public GrGLSLGeometryProcessor { class GLSLProcessor : public GrGLSLGeometryProcessor {
public: public:
GLSLProcessor() {} GLSLProcessor() {}
@ -263,27 +265,27 @@ public:
GrGLSLVertToFrag ellipseOffsets(kVec2f_GrSLType); GrGLSLVertToFrag ellipseOffsets(kVec2f_GrSLType);
varyingHandler->addVarying("EllipseOffsets", &ellipseOffsets); varyingHandler->addVarying("EllipseOffsets", &ellipseOffsets);
vertBuilder->codeAppendf("%s = %s;", ellipseOffsets.vsOut(), vertBuilder->codeAppendf("%s = %s;", ellipseOffsets.vsOut(),
egp.inEllipseOffset()->fName); egp.fInEllipseOffset->fName);
GrGLSLVertToFrag ellipseRadii(kVec4f_GrSLType); GrGLSLVertToFrag ellipseRadii(kVec4f_GrSLType);
varyingHandler->addVarying("EllipseRadii", &ellipseRadii); varyingHandler->addVarying("EllipseRadii", &ellipseRadii);
vertBuilder->codeAppendf("%s = %s;", ellipseRadii.vsOut(), vertBuilder->codeAppendf("%s = %s;", ellipseRadii.vsOut(),
egp.inEllipseRadii()->fName); egp.fInEllipseRadii->fName);
GrGLSLPPFragmentBuilder* fragBuilder = args.fFragBuilder; GrGLSLPPFragmentBuilder* fragBuilder = args.fFragBuilder;
// setup pass through color // setup pass through color
varyingHandler->addPassThroughAttribute(egp.inColor(), args.fOutputColor); varyingHandler->addPassThroughAttribute(egp.fInColor, args.fOutputColor);
// Setup position // Setup position
this->setupPosition(vertBuilder, gpArgs, egp.inPosition()->fName); this->setupPosition(vertBuilder, gpArgs, egp.fInPosition->fName);
// emit transforms // emit transforms
this->emitTransforms(vertBuilder, this->emitTransforms(vertBuilder,
varyingHandler, varyingHandler,
uniformHandler, uniformHandler,
gpArgs->fPositionVar, gpArgs->fPositionVar,
egp.inPosition()->fName, egp.fInPosition->fName,
egp.localMatrix(), egp.fLocalMatrix,
args.fTransformsIn, args.fTransformsIn,
args.fTransformsOut); args.fTransformsOut);
@ -318,7 +320,7 @@ public:
GrProcessorKeyBuilder* b) { GrProcessorKeyBuilder* b) {
const EllipseGeometryProcessor& egp = gp.cast<EllipseGeometryProcessor>(); const EllipseGeometryProcessor& egp = gp.cast<EllipseGeometryProcessor>();
uint16_t key = egp.fStroke ? 0x1 : 0x0; uint16_t key = egp.fStroke ? 0x1 : 0x0;
key |= egp.localMatrix().hasPerspective() ? 0x2 : 0x0; key |= egp.fLocalMatrix.hasPerspective() ? 0x2 : 0x0;
b->add32(key); b->add32(key);
} }
@ -337,15 +339,6 @@ public:
typedef GrGLSLGeometryProcessor INHERITED; typedef GrGLSLGeometryProcessor INHERITED;
}; };
void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
GLSLProcessor::GenKey(*this, caps, b);
}
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
return new GLSLProcessor();
}
private:
const Attribute* fInPosition; const Attribute* fInPosition;
const Attribute* fInColor; const Attribute* fInColor;
const Attribute* fInEllipseOffset; const Attribute* fInEllipseOffset;
@ -398,12 +391,15 @@ public:
const char* name() const override { return "DIEllipseEdge"; } const char* name() const override { return "DIEllipseEdge"; }
const Attribute* inPosition() const { return fInPosition; } void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
const Attribute* inColor() const { return fInColor; } GLSLProcessor::GenKey(*this, caps, b);
const Attribute* inEllipseOffsets0() const { return fInEllipseOffsets0; } }
const Attribute* inEllipseOffsets1() const { return fInEllipseOffsets1; }
const SkMatrix& viewMatrix() const { return fViewMatrix; }
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
return new GLSLProcessor();
}
private:
class GLSLProcessor : public GrGLSLGeometryProcessor { class GLSLProcessor : public GrGLSLGeometryProcessor {
public: public:
GLSLProcessor() GLSLProcessor()
@ -421,22 +417,22 @@ public:
GrGLSLVertToFrag offsets0(kVec2f_GrSLType); GrGLSLVertToFrag offsets0(kVec2f_GrSLType);
varyingHandler->addVarying("EllipseOffsets0", &offsets0); varyingHandler->addVarying("EllipseOffsets0", &offsets0);
vertBuilder->codeAppendf("%s = %s;", offsets0.vsOut(), vertBuilder->codeAppendf("%s = %s;", offsets0.vsOut(),
diegp.inEllipseOffsets0()->fName); diegp.fInEllipseOffsets0->fName);
GrGLSLVertToFrag offsets1(kVec2f_GrSLType); GrGLSLVertToFrag offsets1(kVec2f_GrSLType);
varyingHandler->addVarying("EllipseOffsets1", &offsets1); varyingHandler->addVarying("EllipseOffsets1", &offsets1);
vertBuilder->codeAppendf("%s = %s;", offsets1.vsOut(), vertBuilder->codeAppendf("%s = %s;", offsets1.vsOut(),
diegp.inEllipseOffsets1()->fName); diegp.fInEllipseOffsets1->fName);
GrGLSLPPFragmentBuilder* fragBuilder = args.fFragBuilder; GrGLSLPPFragmentBuilder* fragBuilder = args.fFragBuilder;
varyingHandler->addPassThroughAttribute(diegp.inColor(), args.fOutputColor); varyingHandler->addPassThroughAttribute(diegp.fInColor, args.fOutputColor);
// Setup position // Setup position
this->setupPosition(vertBuilder, this->setupPosition(vertBuilder,
uniformHandler, uniformHandler,
gpArgs, gpArgs,
diegp.inPosition()->fName, diegp.fInPosition->fName,
diegp.viewMatrix(), diegp.fViewMatrix,
&fViewMatrixUniform); &fViewMatrixUniform);
// emit transforms // emit transforms
@ -444,7 +440,7 @@ public:
varyingHandler, varyingHandler,
uniformHandler, uniformHandler,
gpArgs->fPositionVar, gpArgs->fPositionVar,
diegp.inPosition()->fName, diegp.fInPosition->fName,
args.fTransformsIn, args.fTransformsIn,
args.fTransformsOut); args.fTransformsOut);
@ -494,7 +490,7 @@ public:
GrProcessorKeyBuilder* b) { GrProcessorKeyBuilder* b) {
const DIEllipseGeometryProcessor& diegp = gp.cast<DIEllipseGeometryProcessor>(); const DIEllipseGeometryProcessor& diegp = gp.cast<DIEllipseGeometryProcessor>();
uint16_t key = static_cast<uint16_t>(diegp.fStyle); uint16_t key = static_cast<uint16_t>(diegp.fStyle);
key |= ComputePosKey(diegp.viewMatrix()) << 10; key |= ComputePosKey(diegp.fViewMatrix) << 10;
b->add32(key); b->add32(key);
} }
@ -502,8 +498,8 @@ public:
const GrPrimitiveProcessor& gp) override { const GrPrimitiveProcessor& gp) override {
const DIEllipseGeometryProcessor& diegp = gp.cast<DIEllipseGeometryProcessor>(); const DIEllipseGeometryProcessor& diegp = gp.cast<DIEllipseGeometryProcessor>();
if (!diegp.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(diegp.viewMatrix())) { if (!diegp.fViewMatrix.isIdentity() && !fViewMatrix.cheapEqualTo(diegp.fViewMatrix)) {
fViewMatrix = diegp.viewMatrix(); fViewMatrix = diegp.fViewMatrix;
float viewMatrix[3 * 3]; float viewMatrix[3 * 3];
GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix); GrGLSLGetMatrix<3>(viewMatrix, fViewMatrix);
pdman.setMatrix3f(fViewMatrixUniform, viewMatrix); pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
@ -517,15 +513,6 @@ public:
typedef GrGLSLGeometryProcessor INHERITED; typedef GrGLSLGeometryProcessor INHERITED;
}; };
void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
GLSLProcessor::GenKey(*this, caps, b);
}
GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override {
return new GLSLProcessor();
}
private:
const Attribute* fInPosition; const Attribute* fInPosition;
const Attribute* fInColor; const Attribute* fInColor;
const Attribute* fInEllipseOffsets0; const Attribute* fInEllipseOffsets0;