diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-02-02 20:32:49 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-03 01:59:59 +0000 |
| commit | bdecacfbe47bc7211336bb847bb33c00ef85ea3e (patch) | |
| tree | fdaac47f9254d9a8e3de61604b899eae8cb718ff /debugger | |
| parent | 816acee9be62d9de323ff5144017451e443b3329 (diff) | |
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend.""""""
This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32.
Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version
Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab
Reviewed-on: https://skia-review.googlesource.com/103181
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/QT/SkGLWidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp index baee2bbdac..44a15dca38 100644 --- a/debugger/QT/SkGLWidget.cpp +++ b/debugger/QT/SkGLWidget.cpp @@ -20,7 +20,7 @@ SkGLWidget::~SkGLWidget() { void SkGLWidget::setSampleCount(int sampleCount) { QGLFormat currentFormat = format(); - currentFormat.setSampleBuffers(sampleCount > 0); + currentFormat.setSampleBuffers(sampleCount > 1); currentFormat.setSamples(sampleCount); setFormat(currentFormat); } @@ -89,6 +89,7 @@ GrBackendRenderTarget SkGLWidget::getBackendRenderTarget() { int sampleCnt; GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_FRAMEBUFFER_BINDING, &info.fFBOID); GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_SAMPLES, &sampleCnt); + sampleCnt = SkTMax(sampleCnt, 1); GR_GL_GetIntegerv(fCurIntf.get(), GR_GL_STENCIL_BITS, &stencilBits); // We are on desktop so we assume the internal config is RGBA info.fFormat = GR_GL_RGBA8; |