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

Unified Diff: src/gpu/gl/GrGLPathProcessor.h

Issue 1110553003: Remove legacy NVPR support (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comments Created 5 years, 8 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/gl/GrGLCaps.cpp ('k') | src/gpu/gl/GrGLPathProcessor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLPathProcessor.h
diff --git a/src/gpu/gl/GrGLPathProcessor.h b/src/gpu/gl/GrGLPathProcessor.h
index 0351e7fc826a27e177f46eabfb405c48915955e8..66a39fe10364a024297874cce0fb078bd9dfae78 100644
--- a/src/gpu/gl/GrGLPathProcessor.h
+++ b/src/gpu/gl/GrGLPathProcessor.h
@@ -25,78 +25,25 @@ public:
void emitCode(EmitArgs&) override;
- virtual void emitTransforms(GrGLGPBuilder*, const TransformsIn&, TransformsOut*) = 0;
+ void emitTransforms(GrGLGPBuilder*, const TransformsIn&, TransformsOut*);
- virtual void resolveSeparableVaryings(GrGLGpu* gpu, GrGLuint programId) {}
+ void resolveSeparableVaryings(GrGLGpu* gpu, GrGLuint programId);
void setData(const GrGLProgramDataManager&,
const GrPrimitiveProcessor&,
const GrBatchTracker&) override;
- virtual void setTransformData(const GrPrimitiveProcessor&,
- int index,
- const SkTArray<const GrCoordTransform*, true>& transforms,
- GrGLPathRendering*,
- GrGLuint programID) = 0;
+ void setTransformData(const GrPrimitiveProcessor&,
+ int index,
+ const SkTArray<const GrCoordTransform*, true>& transforms,
+ GrGLPathRendering*,
+ GrGLuint programID);
virtual void didSetData(GrGLPathRendering*) {}
private:
UniformHandle fColorUniform;
GrColor fColor;
-
- typedef GrGLPrimitiveProcessor INHERITED;
-};
-
-class GrGLLegacyPathProcessor : public GrGLPathProcessor {
-public:
- GrGLLegacyPathProcessor(const GrPathProcessor& pathProc, const GrBatchTracker& bt,
- int maxTexCoords)
- : INHERITED(pathProc, bt)
- , fTexCoordSetCnt(0) {
- SkDEBUGCODE(fMaxTexCoords = maxTexCoords;)
- }
-
- int addTexCoordSets(int count) {
- int firstFreeCoordSet = fTexCoordSetCnt;
- fTexCoordSetCnt += count;
- SkASSERT(fMaxTexCoords >= fTexCoordSetCnt);
- return firstFreeCoordSet;
- }
-
- void emitTransforms(GrGLGPBuilder*, const TransformsIn& tin, TransformsOut* tout) override;
-
- void setTransformData(const GrPrimitiveProcessor& primProc,
- int index,
- const SkTArray<const GrCoordTransform*, true>& transforms,
- GrGLPathRendering* glpr,
- GrGLuint) override;
-
- void didSetData(GrGLPathRendering* glpr) override;
-
-private:
- SkDEBUGCODE(int fMaxTexCoords;)
- int fTexCoordSetCnt;
-
- typedef GrGLPathProcessor INHERITED;
-};
-
-class GrGLNormalPathProcessor : public GrGLPathProcessor {
-public:
- GrGLNormalPathProcessor(const GrPathProcessor& pathProc, const GrBatchTracker& bt)
- : INHERITED(pathProc, bt) {}
-
- void emitTransforms(GrGLGPBuilder* pb, const TransformsIn& tin,TransformsOut* tout) override;
-
- void resolveSeparableVaryings(GrGLGpu* gpu, GrGLuint programId);
-
- void setTransformData(const GrPrimitiveProcessor& primProc,
- int index,
- const SkTArray<const GrCoordTransform*, true>& coordTransforms,
- GrGLPathRendering* glpr,
- GrGLuint programID) override;
-
-private:
struct SeparableVaryingInfo {
GrSLType fType;
GrGLShaderVar fVariable;
@@ -107,7 +54,7 @@ private:
SeparableVaryingInfoArray fSeparableVaryingInfos;
- typedef GrGLPathProcessor INHERITED;
+ typedef GrGLPrimitiveProcessor INHERITED;
};
#endif
« no previous file with comments | « src/gpu/gl/GrGLCaps.cpp ('k') | src/gpu/gl/GrGLPathProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698