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

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

Issue 15252004: Make GrGLProgramDesc's key variable length by compacting the effect key array (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: address comments, fix unit test Created 7 years, 7 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 | « no previous file | 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 578b4a99cf22eb54a2043503fd00c0e37a34eee7..be6e6878dfad918cae6019fb7e39f9b6c042fbe9 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -48,7 +48,7 @@ public:
void abandon();
/**
- * The shader may modify the blend coefficients. Params are in/out
+ * The shader may modify the blend coefficients. Params are in/out.
*/
void overrideBlend(GrBlendCoeff* srcCoeff, GrBlendCoeff* dstCoeff) const;
@@ -104,12 +104,10 @@ public:
* This function uploads uniforms and calls each GrGLEffect's setData. It is called before a
* draw occurs using the program after the program has already been bound. It also uses the
* GrGpuGL object to bind the textures required by the GrGLEffects.
- *
- * The color and coverage params override the GrDrawState's getColor() and getCoverage() values.
*/
void setData(GrGpuGL*,
- GrColor color,
- GrColor coverage,
+ GrDrawState::BlendOptFlags,
+ const GrEffectStage* stages[], // output of GrGLProgramDesc:Build()
const GrDeviceCoordTexture* dstCopy, // can be NULL
SharedGLState*);
@@ -121,7 +119,9 @@ private:
bool succeeded() const { return 0 != fProgramID; }
/**
- * This is the heavy initialization routine for building a GLProgram.
+ * This is the heavy initialization routine for building a GLProgram. stages is all the enabled
+ * color stages followed by all the enabled coverage stages as output by
+ * GrGLProgramDesc::Build()
*/
bool genProgram(const GrEffectStage* stages[]);
« no previous file with comments | « no previous file | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698