aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl
diff options
context:
space:
mode:
authorGravatar egdaniel <egdaniel@google.com>2015-01-20 06:34:51 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-20 06:34:51 -0800
commit71e236c03e65ff6b48a3d0eb091f814dd3e3a928 (patch)
tree3b3ca3eb421a45b6aaf151c2e227cc1de4655a38 /src/gpu/gl
parentb2b416d3847c138a0a13876fdc1cdeae607b7e31 (diff)
Remove willReadDst from GrFragmentProcessor.
Since only XP's can read dst now, there is no reason to have this query on GrFP. This also triggered a chain reaction of cleaning up/removing unnecessary code elsewhere. BUG=skia: Review URL: https://codereview.chromium.org/851143003
Diffstat (limited to 'src/gpu/gl')
-rw-r--r--src/gpu/gl/builders/GrGLProgramBuilder.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
index 8ec0d2ddbe..c88efac9f0 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
@@ -359,14 +359,11 @@ void GrGLProgramBuilder::verify(const GrPrimitiveProcessor& gp) {
}
void GrGLProgramBuilder::verify(const GrXferProcessor& xp) {
- // TODO: Once will readDst is only xp enable this assert and remove it from the
- // FragmentProcessor verify()
- //SkASSERT(fFS.hasReadDstColor() == xp.willReadDstColor());
+ SkASSERT(fFS.hasReadDstColor() == xp.willReadDstColor());
}
void GrGLProgramBuilder::verify(const GrFragmentProcessor& fp) {
SkASSERT(fFS.hasReadFragmentPosition() == fp.willReadFragmentPosition());
- SkASSERT(fFS.hasReadDstColor() == fp.willReadDstColor());
}
template <class Proc>