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

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

Issue 1336763003: remove path specific program building classes (Closed) Base URL: https://skia.googlesource.com/skia.git@pathgp
Patch Set: tweaks Created 5 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
Index: src/gpu/gl/GrGLProgram.h
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index 4dfeba345c09d36db571549cdbfa36bf54259c9a..7222f5cf6a8f1808635c5051a949c9055f11a53d 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -34,8 +34,6 @@ class GrPipeline;
*/
class GrGLProgram : public SkRefCnt {
public:
-
-
typedef GrGLProgramBuilder::BuiltinUniformHandles BuiltinUniformHandles;
virtual ~GrGLProgram();
@@ -100,12 +98,14 @@ public:
protected:
typedef GrGLProgramDataManager::UniformHandle UniformHandle;
typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
+ typedef GrGLProgramDataManager::SeparableVaryingInfoArray SeparableVaryingInfoArray;
GrGLProgram(GrGLGpu*,
const GrProgramDesc&,
const BuiltinUniformHandles&,
GrGLuint programID,
const UniformInfoArray&,
+ const SeparableVaryingInfoArray&,
GrGLInstalledGeoProc* geometryProcessor,
GrGLInstalledXferProc* xferProcessor,
GrGLInstalledFragProcs* fragmentProcessors,
@@ -119,12 +119,6 @@ protected:
int index,
GrGLInstalledFragProc*);
- /*
- * Legacy NVPR needs a hook here to flush path tex gen settings.
- * TODO when legacy nvpr is removed, remove this call.
- */
- virtual void didSetData() {}
-
// Helper for setData() that sets the view matrix and loads the render target height uniform
void setRenderTargetState(const GrPrimitiveProcessor&, const GrPipeline&);
virtual void onSetRenderTargetState(const GrPrimitiveProcessor&, const GrPipeline&);

Powered by Google App Engine
This is Rietveld 408576698