diff options
| author |  joshualitt <joshualitt@google.com> | 2015-05-19 07:15:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-19 07:15:28 -0700 |
| commit | d3a560fa80bfb3e2d2e989f951bb3b1c52316654 (patch) | |
| tree | 6702bf0af4281910271596fe9b11316902194d79 /src/gpu/gl/GrGLPrimitiveProcessor.h | |
| parent | cbfe91d82500f4ae8c3ff7bd74b3021a4b89fd84 (diff) | |
Revert of Preliminary attempt to remove batch tracker (patchset #3 id:40001 of https://codereview.chromium.org/1139723004/)
Reason for revert:
breaking bots
Original issue's description:
> Preliminary attempt to remove batch tracker
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/cbfe91d82500f4ae8c3ff7bd74b3021a4b89fd84
TBR=robertphillips@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1132323003
Diffstat (limited to 'src/gpu/gl/GrGLPrimitiveProcessor.h')
| -rw-r--r-- | src/gpu/gl/GrGLPrimitiveProcessor.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.h b/src/gpu/gl/GrGLPrimitiveProcessor.h index 90ee2038f8..30b1c178cd 100644 --- a/src/gpu/gl/GrGLPrimitiveProcessor.h +++ b/src/gpu/gl/GrGLPrimitiveProcessor.h @@ -74,7 +74,16 @@ public: static SkMatrix GetTransformMatrix(const SkMatrix& localMatrix, const GrCoordTransform&); protected: - void setupUniformColor(GrGLGPBuilder* pb, const char* outputName, UniformHandle* colorUniform); + /** a helper which can setup vertex, constant, or uniform color depending on inputType. + * This function will only do the minimum required to emit the correct shader code. If + * inputType == attribute, then colorAttr must not be NULL. Likewise, if inputType == Uniform + * then colorUniform must not be NULL. + */ + void setupColorPassThrough(GrGLGPBuilder* pb, + GrGPInput inputType, + const char* inputName, + const GrPrimitiveProcessor::Attribute* colorAttr, + UniformHandle* colorUniform); const char* uViewM() const { return fViewMatrixName; } |