From c7ad40f76f6f23b3acd73b53e989220fd71f2da2 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Thu, 31 May 2018 14:27:17 -0400 Subject: Remove SK_SUPPORT_GPU checks in tool-only code Most of this is (obviously) not necessary to do, but once I started, I figured I'd just get it all. Tools (nanobench, DM, skiaserve), all GMs, benches, and unit tests, plus support code (command line parsing and config stuff). This is almost entirely mechanical. Bug: skia: Change-Id: I209500f8df8c5bd43f8298ff26440d1c4d7425fb Reviewed-on: https://skia-review.googlesource.com/131153 Reviewed-by: Mike Klein Reviewed-by: Brian Salomon Commit-Queue: Brian Osman --- gm/dftext_blob_persp.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gm/dftext_blob_persp.cpp') diff --git a/gm/dftext_blob_persp.cpp b/gm/dftext_blob_persp.cpp index cfa681d984..e9df4afd19 100644 --- a/gm/dftext_blob_persp.cpp +++ b/gm/dftext_blob_persp.cpp @@ -46,7 +46,6 @@ protected: virtual void onDraw(SkCanvas* inputCanvas) override { // set up offscreen rendering with distance field text -#if SK_SUPPORT_GPU GrContext* ctx = inputCanvas->getGrContext(); SkISize size = this->onISize(); if (!inputCanvas->getBaseLayerSize().isEmpty()) { @@ -60,9 +59,6 @@ protected: SkCanvas* canvas = surface ? surface->getCanvas() : inputCanvas; // init our new canvas with the old canvas's matrix canvas->setMatrix(inputCanvas->getTotalMatrix()); -#else - SkCanvas* canvas = inputCanvas; -#endif SkScalar x = 0, y = 0; SkScalar maxH = 0; for (auto twm : {TranslateWithMatrix::kNo, TranslateWithMatrix::kYes}) { @@ -88,7 +84,6 @@ protected: maxH = 0; } } -#if SK_SUPPORT_GPU // render offscreen buffer if (surface) { SkAutoCanvasRestore acr(inputCanvas, true); @@ -96,7 +91,6 @@ protected: inputCanvas->resetMatrix(); inputCanvas->drawImage(surface->makeImageSnapshot().get(), 0, 0, nullptr); } -#endif } private: -- cgit v1.2.3