From 36e5adbaaac9bfffa5eb377565e5c28659eb51af Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 17 Aug 2016 16:29:39 -0700 Subject: [PATCH] Revert of Reduce window rectangles cap to 8 (patchset #1 id:1 of https://codereview.chromium.org/2254013002/ ) Reason for revert: Breaking Ubuntu Original issue's description: > Reduce window rectangles cap to 8 > > Lowers the cap to 8 and adds a warning message if this value is ever > exceeded. The largest (only) implementation currently supports 8, so > there isn't yet reason to go higher. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2254013002 > > Committed: https://skia.googlesource.com/skia/+/52d721580ee22525c285e2d13cf3975a7a1b2843 TBR=mjk@nvidia.com,bsalomon@google.com,csmartdalton@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2253293003 --- src/gpu/GrCaps.cpp | 2 -- src/gpu/GrWindowRectangles.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index 9f92210..622c685 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -141,8 +141,6 @@ void GrCaps::applyOptionsOverrides(const GrContextOptions& options) { fMaxTileSize = options.fMaxTileSizeOverride; } if (fMaxWindowRectangles > GrWindowRectangles::kMaxWindows) { - SkDebugf("WARNING: capping window rectangles at %i. HW advertises support for %i.\n", - GrWindowRectangles::kMaxWindows, fMaxWindowRectangles); fMaxWindowRectangles = GrWindowRectangles::kMaxWindows; } } diff --git a/src/gpu/GrWindowRectangles.h b/src/gpu/GrWindowRectangles.h index f83f8dd..682af93 100644 --- a/src/gpu/GrWindowRectangles.h +++ b/src/gpu/GrWindowRectangles.h @@ -13,7 +13,7 @@ class GrWindowRectangles { public: - constexpr static int kMaxWindows = 8; + constexpr static int kMaxWindows = 16; enum class Mode : bool { kExclusive, -- 2.7.4