src/gpu/effects/GrDistanceFieldTextureEffect.cpp - Issue 920933002: fix for uniform view matrix being uploaded but not used

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 920933002: fix for uniform view matrix being uploaded but not used (Closed) Base URL: https://skia.googlesource.com/skia.git@gp_cleanup_1

Patch Set: Created 5 years, 10 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:

Index: src/gpu/effects/GrDistanceFieldTextureEffect.cpp

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

index dfc4ca148354d9a92b19f42a6204d4a508817bfd..1a8a07e3a26bda4986be8809bf1077d50be3ea7b 100755

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

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

@@ -57,12 +57,8 @@ public:

this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor,

dfTexEffect.inColor(), &fColorUniform);

- // setup uniform viewMatrix

- this->addUniformViewMatrix(pb);

// Setup position

- SetupPosition(vsBuilder, gpArgs, dfTexEffect.inPosition()->fName,

- dfTexEffect.viewMatrix(), this->uViewM());

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

// emit transforms

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

@@ -357,12 +353,8 @@ public:

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

- // setup uniform viewMatrix

- this->addUniformViewMatrix(pb);

// Setup position

- SetupPosition(vsBuilder, gpArgs, dfTexEffect.inPosition()->fName,

- dfTexEffect.viewMatrix(), this->uViewM());

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

// emit transforms

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

@@ -602,12 +594,8 @@ public:

this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, NULL,

&fColorUniform);

- // setup uniform viewMatrix

- this->addUniformViewMatrix(pb);

// Setup position

- SetupPosition(vsBuilder, gpArgs, dfTexEffect.inPosition()->fName,

- dfTexEffect.viewMatrix(), this->uViewM());

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

// emit transforms

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

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