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

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: a few more tidys 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
« no previous file with comments | « src/gpu/gl/GrGLPrimitiveProcessor.h ('k') | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLProgram.h
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index 4dfeba345c09d36db571549cdbfa36bf54259c9a..7b10c147b4f33c8d68e1f0ea6eb37f9aa6987283 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -9,7 +9,6 @@
#ifndef GrGLProgram_DEFINED
#define GrGLProgram_DEFINED
-#include "builders/GrGLProgramBuilder.h"
#include "GrGLContext.h"
#include "GrGLProgramDesc.h"
#include "GrGLTexture.h"
@@ -18,6 +17,8 @@
#include "SkString.h"
#include "SkXfermode.h"
+#include "builders/GrGLProgramBuilder.h"
+
class GrGLProcessor;
class GrGLInstalledProcessors;
class GrGLProgramBuilder;
@@ -34,11 +35,9 @@ class GrPipeline;
*/
class GrGLProgram : public SkRefCnt {
public:
-
-
typedef GrGLProgramBuilder::BuiltinUniformHandles BuiltinUniformHandles;
- virtual ~GrGLProgram();
+ ~GrGLProgram();
/**
* Call to abandon GL objects owned by this program.
@@ -100,12 +99,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,
@@ -114,20 +115,13 @@ protected:
// A templated helper to loop over effects, set the transforms(via subclass) and bind textures
void setFragmentData(const GrPrimitiveProcessor&, const GrPipeline&,
SkTArray<const GrTextureAccess*>* textureBindings);
- virtual void setTransformData(const GrPrimitiveProcessor&,
- const GrFragmentProcessor&,
- 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() {}
+ void setTransformData(const GrPrimitiveProcessor&,
+ const GrFragmentProcessor&,
+ int index,
+ GrGLInstalledFragProc*);
// 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&);
// these reflect the current values of uniforms (GL uniform values travel with program)
RenderTargetState fRenderTargetState;
« no previous file with comments | « src/gpu/gl/GrGLPrimitiveProcessor.h ('k') | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698