Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: src/gpu/glsl/GrGLSLGeometryProcessor.h

Issue 2336723002: Remove base class for installed transforms in GrPrimitiveProcessor (Closed)
Patch Set: rm unused type field for glsl geo proc Created 4 years, 3 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
« no previous file with comments | « src/gpu/GrPathProcessor.cpp ('k') | src/gpu/glsl/GrGLSLPrimitiveProcessor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/glsl/GrGLSLGeometryProcessor.h
diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.h b/src/gpu/glsl/GrGLSLGeometryProcessor.h
index 00652a5b99bd2b07834ea55f5e0f4f0bd7a2ff67..d403c8fc7fc195bd25a0c642ba5b192a1bd1f859 100644
--- a/src/gpu/glsl/GrGLSLGeometryProcessor.h
+++ b/src/gpu/glsl/GrGLSLGeometryProcessor.h
@@ -36,7 +36,7 @@ protected:
const GrGLSLProgramDataManager& pdman,
int index,
const SkTArray<const GrCoordTransform*, true>& transforms) {
- SkSTArray<2, UniformTransform, true>& procTransforms = fInstalledTransforms[index];
+ SkTArray<TransformUniform, true>& procTransforms = fInstalledTransforms[index];
int numTransforms = transforms.count();
for (int t = 0; t < numTransforms; ++t) {
SkASSERT(procTransforms[t].fHandle.isValid());
@@ -105,12 +105,12 @@ protected:
private:
virtual void onEmitCode(EmitArgs&, GrGPArgs*) = 0;
- struct UniformTransform : public Transform {
- UniformTransform() : Transform() {}
+ struct TransformUniform {
UniformHandle fHandle;
+ SkMatrix fCurrentValue = SkMatrix::InvalidMatrix();
};
- SkSTArray<8, SkSTArray<2, UniformTransform, true> > fInstalledTransforms;
+ SkSTArray<8, SkSTArray<2, TransformUniform, true> > fInstalledTransforms;
typedef GrGLSLPrimitiveProcessor INHERITED;
};
« no previous file with comments | « src/gpu/GrPathProcessor.cpp ('k') | src/gpu/glsl/GrGLSLPrimitiveProcessor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698