From 108bb232775c0b768ce1beca929ed31a97b46ed3 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Tue, 3 Jul 2018 16:18:29 -0400 Subject: Reland "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors." This reverts commit 34aa059c1502d67c9a5f4db449667a8709b69fb9. Reason for revert: Original change's description: > Revert "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors." > > This reverts commit ff2181e62e79ffd2ce628fc8c05b5457d4f54163. > > Reason for revert: suspect it's behind Chrome roll failure > > Original change's description: > > Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors. > > > > Bug: skia: > > Change-Id: I1466668e3502cd1e6e1f6aed4105e0f626d293dd > > Reviewed-on: https://skia-review.googlesource.com/138987 > > Commit-Queue: Greg Daniel > > Reviewed-by: Robert Phillips > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > Change-Id: I4cba44858aafffbadc45e18349b93c741d7cfc66 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/139220 > Reviewed-by: Ethan Nicholas > Commit-Queue: Ethan Nicholas Bug: skia: Change-Id: Ib1fd10c126862824f3e31c420c697ac749c637f5 Reviewed-on: https://skia-review.googlesource.com/139221 Commit-Queue: Greg Daniel Reviewed-by: Robert Phillips --- tools/gpu/GrTest.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'tools') diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 7ec66bbd68..890d26a2ab 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -294,17 +294,6 @@ void GrDrawingManager::testingOnly_removeOnFlushCallbackObject(GrOnFlushCallback ////////////////////////////////////////////////////////////////////////////// -GrPixelConfig GrBackendTexture::testingOnly_getPixelConfig() const { - return fConfig; -} - -GrPixelConfig GrBackendRenderTarget::testingOnly_getPixelConfig() const { - return fConfig; -} - -////////////////////////////////////////////////////////////////////////////// - - void GrCoverageCountingPathRenderer::testingOnly_drawPathDirectly(const DrawPathArgs& args) { // Call onDrawPath() directly: We want to test paths that might fail onCanDrawPath() simply for // performance reasons, and GrPathRenderer::drawPath() assert that this call returns true. -- cgit v1.2.3