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

Unified Diff: src/gpu/gl/GrGLPathRendering.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/GrGLPathProcessor.cpp ('k') | src/gpu/gl/GrGLPathRendering.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLPathRendering.h
diff --git a/src/gpu/gl/GrGLPathRendering.h b/src/gpu/gl/GrGLPathRendering.h
index ba8abd63bd540c803ddc344b42763b389964dd73..25e8ef03ef19a0fe1b5d172c410697f18f08f6a2 100644
--- a/src/gpu/gl/GrGLPathRendering.h
+++ b/src/gpu/gl/GrGLPathRendering.h
@@ -54,34 +54,6 @@ public:
*/
void abandonGpuResources();
-
- enum TexturingMode {
- FixedFunction_TexturingMode,
- SeparableShaders_TexturingMode
- };
-
- /** Specifies whether texturing should use fixed fuction pipe or separable shaders
- * Specifies whether texturing should use fixed fuction pipe or whether
- * it is ok to use normal vertex and fragment shaders, and for path rendering
- * populate fragment shaders with setProgramPathFragmentInputTransform.
- * The fixed function mode will be removed once the other mode is more widely
- * available.
- */
- TexturingMode texturingMode() const {
- return caps().fragmentInputGenSupport ?
- SeparableShaders_TexturingMode : FixedFunction_TexturingMode;
- }
-
- // Functions for fixed function texturing support.
- enum PathTexGenComponents {
- kS_PathTexGenComponents = 1,
- kST_PathTexGenComponents = 2,
- kSTR_PathTexGenComponents = 3
- };
- void enablePathTexGen(int unitIdx, PathTexGenComponents, const GrGLfloat* coefficients);
- void enablePathTexGen(int unitIdx, PathTexGenComponents, const SkMatrix& matrix);
- void flushPathTexGenSettings(int numUsedTexCoordSets);
-
// Functions for "separable shader" texturing support.
void setProgramPathFragmentInputTransform(GrGLuint program, GrGLint location,
GrGLenum genMode, GrGLint components,
@@ -168,8 +140,6 @@ private:
GrGLint fNumComponents;
GrGLfloat fCoefficients[3 * 3];
};
- int fHWActivePathTexGenSets;
- SkTArray<PathTexGenData, true> fHWPathTexGenSettings;
};
#endif
« no previous file with comments | « src/gpu/gl/GrGLPathProcessor.cpp ('k') | src/gpu/gl/GrGLPathRendering.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698