aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/sk_app/Window.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2018-02-01 14:16:02 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-01 21:15:39 +0000
commitd0d7270fcc32546005b8e847df516cb11592cd30 (patch)
tree032f102536ecb8e665c348b733b230a062a1c010 /tools/sk_app/Window.cpp
parent2331c82e0d10ee519d9afb3f9e85485c6cf0b3c3 (diff)
Revert "Revert "Redefine the meaning of sample counts in GPU backend.""
Fixes gpu config default samples to be 1 and updates config parsing test accordingly. This reverts commit c1ce2f7966babaae0deb150f93f1227ee5af9285. Bug: skia: Change-Id: I456973b1f52ced85a2011ea10fc49449bfc5846f Reviewed-on: https://skia-review.googlesource.com/102147 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools/sk_app/Window.cpp')
-rw-r--r--tools/sk_app/Window.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/sk_app/Window.cpp b/tools/sk_app/Window.cpp
index 29e4864ba1..1694beaac8 100644
--- a/tools/sk_app/Window.cpp
+++ b/tools/sk_app/Window.cpp
@@ -117,7 +117,7 @@ void Window::setRequestedDisplayParams(const DisplayParams& params, bool /* allo
int Window::sampleCount() const {
if (!fWindowContext) {
- return -1;
+ return 0;
}
return fWindowContext->sampleCount();
}