src/gpu/effects/GrDistanceFieldGeoProc.cpp - Issue 1151693005: Remove uniform view matrix from GrGLPrimitiveProcessor base class

Unified Diff: src/gpu/effects/GrDistanceFieldGeoProc.cpp

Issue 1151693005: Remove uniform view matrix from GrGLPrimitiveProcessor base class (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/effects/GrDistanceFieldGeoProc.cpp

diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp

index 92fe0a4ab7c221f69e4700b188a2703ceed9fa58..dab8d523ef8859a8ca017920688093ee025374a8 100755

--- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp

+++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp

@@ -25,7 +25,8 @@ class GrGLDistanceFieldA8TextGeoProc : public GrGLGeometryProcessor {

public:

GrGLDistanceFieldA8TextGeoProc(const GrGeometryProcessor&,

const GrBatchTracker&)

- : fColor(GrColor_ILLEGAL)

+ : fViewMatrix(SkMatrix::InvalidMatrix())

+ , fColor(GrColor_ILLEGAL)

#ifdef SK_GAMMA_APPLY_TO_A8

, fDistanceAdjust(-1.0f)

#endif

@@ -63,7 +64,8 @@ public:

}

// Setup position

- this->setupPosition(pb, gpArgs, dfTexEffect.inPosition()->fName, dfTexEffect.viewMatrix());

+ this->setupPosition(pb, gpArgs, dfTexEffect.inPosition()->fName, dfTexEffect.viewMatrix(),

+ &fViewMatrixUniform);

// emit transforms

this->emitTransforms(args.fPB, gpArgs->fPositionVar, dfTexEffect.inPosition()->fName,

@@ -148,9 +150,14 @@ public:

fDistanceAdjust = distanceAdjust;

}

#endif

const GrDistanceFieldA8TextGeoProc& dfa8gp = proc.cast<GrDistanceFieldA8TextGeoProc>();

- this->setUniformViewMatrix(pdman, dfa8gp.viewMatrix());

+ if (!dfa8gp.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dfa8gp.viewMatrix())) {

+ fViewMatrix = dfa8gp.viewMatrix();

+ GrGLfloat viewMatrix[3 * 3];

+ GrGLGetMatrix<3>(viewMatrix, fViewMatrix);

+ pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);

+ }

if (dfa8gp.color() != fColor && !dfa8gp.hasVertexColor()) {

GrGLfloat c[4];

@@ -173,8 +180,10 @@ public:

}

private:

+ SkMatrix fViewMatrix;

GrColor fColor;

UniformHandle fColorUniform;

+ UniformHandle fViewMatrixUniform;

#ifdef SK_GAMMA_APPLY_TO_A8

float fDistanceAdjust;

UniformHandle fDistanceAdjustUni;

@@ -266,7 +275,9 @@ class GrGLDistanceFieldPathGeoProc : public GrGLGeometryProcessor {

public:

GrGLDistanceFieldPathGeoProc(const GrGeometryProcessor&,

const GrBatchTracker&)

- : fColor(GrColor_ILLEGAL), fTextureSize(SkISize::Make(-1, -1)) {}

+ : fViewMatrix(SkMatrix::InvalidMatrix())

+ , fColor(GrColor_ILLEGAL)

+ , fTextureSize(SkISize::Make(-1, -1)) {}

void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{

const GrDistanceFieldPathGeoProc& dfTexEffect = args.fGP.cast<GrDistanceFieldPathGeoProc>();

@@ -295,7 +306,8 @@ public:

vsBuilder->codeAppendf("%s = %s;", v.vsOut(), dfTexEffect.inTextureCoords()->fName);

// Setup position

- this->setupPosition(pb, gpArgs, dfTexEffect.inPosition()->fName, dfTexEffect.viewMatrix());

+ this->setupPosition(pb, gpArgs, dfTexEffect.inPosition()->fName, dfTexEffect.viewMatrix(),

+ &fViewMatrixUniform);

// emit transforms

this->emitTransforms(args.fPB, gpArgs->fPositionVar, dfTexEffect.inPosition()->fName,

@@ -372,7 +384,13 @@ public:

}

const GrDistanceFieldPathGeoProc& dfpgp = proc.cast<GrDistanceFieldPathGeoProc>();

- this->setUniformViewMatrix(pdman, dfpgp.viewMatrix());

+ if (!dfpgp.viewMatrix().isIdentity() && !fViewMatrix.cheapEqualTo(dfpgp.viewMatrix())) {

+ fViewMatrix = dfpgp.viewMatrix();

+ GrGLfloat viewMatrix[3 * 3];

+ GrGLGetMatrix<3>(viewMatrix, fViewMatrix);

+ pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);

+ }

if (dfpgp.color() != fColor) {

GrGLfloat c[4];

@@ -398,6 +416,8 @@ public:

private:

UniformHandle fColorUniform;

UniformHandle fTextureSizeUni;

+ UniformHandle fViewMatrixUniform;

+ SkMatrix fViewMatrix;

GrColor fColor;

SkISize fTextureSize;

@@ -478,7 +498,7 @@ GrGeometryProcessor* GrDistanceFieldPathGeoProc::TestCreate(SkRandom* random,

class GrGLDistanceFieldLCDTextGeoProc : public GrGLGeometryProcessor {

public:

GrGLDistanceFieldLCDTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&)

- : fColor(GrColor_ILLEGAL) {

+ : fViewMatrix(SkMatrix::InvalidMatrix()), fColor(GrColor_ILLEGAL) {

fDistanceAdjust = GrDistanceFieldLCDTextGeoProc::DistanceAdjust::Make(1.0f, 1.0f, 1.0f);

}

@@ -498,7 +518,8 @@ public:

}

// Setup position

- this->setupPosition(pb, gpArgs, dfTexEffect.inPosition()->fName, dfTexEffect.viewMatrix());

+ this->setupPosition(pb, gpArgs, dfTexEffect.inPosition()->fName, dfTexEffect.viewMatrix(),

+ &fViewMatrixUniform);

// emit transforms

this->emitTransforms(args.fPB, gpArgs->fPositionVar, dfTexEffect.inPosition()->fName,

@@ -630,7 +651,13 @@ public:

fDistanceAdjust = wa;

}

robertphillips 2015/05/21 18:07:41 can this if test not all be on 1 line ?

- this->setUniformViewMatrix(pdman, dfTexEffect.viewMatrix());

+ if (!dfTexEffect.viewMatrix().isIdentity() &&

+ !fViewMatrix.cheapEqualTo(dfTexEffect.viewMatrix())) {

+ fViewMatrix = dfTexEffect.viewMatrix();

+ GrGLfloat viewMatrix[3 * 3];

+ GrGLGetMatrix<3>(viewMatrix, fViewMatrix);

+ pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);

+ }

if (dfTexEffect.color() != fColor) {

GrGLfloat c[4];

@@ -653,7 +680,9 @@ public:

}

private:

+ SkMatrix fViewMatrix;

GrColor fColor;

+ UniformHandle fViewMatrixUniform;

UniformHandle fColorUniform;

GrDistanceFieldLCDTextGeoProc::DistanceAdjust fDistanceAdjust;

UniformHandle fDistanceAdjustUni;

« src/gpu/GrDefaultGeoProcFactory.cpp ('K') | « src/gpu/effects/GrBezierEffect.cpp ('k') | src/gpu/gl/GrGLGeometryProcessor.h » ('j') | no next file with comments »