| commit | f78c60c92a8c212fc462262f2ce81e584d0f02f8 | [log] [tgz] |
|---|---|---|
| author | joshualitt <joshualitt@google.com> | Thu Dec 04 06:01:45 2014 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Dec 04 06:01:45 2014 -0800 |
| tree | 33a43f1d293a54764399846c504d1506d2cbd9e0 | |
| parent | 841a6b54c11137e210aa81e8b56e1763c3571cb8 [diff] [blame] |
Revert of move program descriptor generation to flush (patchset #7 id:120001 of https://codereview.chromium.org/777673003/) Reason for revert: breaking linux build Original issue's description: > move program descriptor generation to flush > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/829e1b80b1020b17f2078020c990e079b70c077c TBR=egdaniel@google.com,bsalomon@google.com,joshualitt@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/776243005
diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp index 7038c10..48f72a7 100644 --- a/src/gpu/GrTest.cpp +++ b/src/gpu/GrTest.cpp
@@ -140,7 +140,7 @@ return false; } - bool flushGraphicsState(const GrOptDrawState&) SK_OVERRIDE { return false; } + bool flushGraphicsState(const GrOptDrawState&, DrawType) SK_OVERRIDE { return false; } void clearStencil(GrRenderTarget* target) SK_OVERRIDE {}