aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-08-17 16:29:39 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-17 16:29:39 -0700
commit36e5adbaaac9bfffa5eb377565e5c28659eb51af (patch)
tree9635a8f78a3ccf131af26f08081b3a1d37ce72bd /src/gpu
parent671fec43e51533b9969502c072cd29d88ebef6ea (diff)
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
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/GrCaps.cpp2
-rw-r--r--src/gpu/GrWindowRectangles.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index 9f92210ae8..622c6855fa 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 f83f8ddd41..682af9353d 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,