diff options
| author |  csmartdalton <csmartdalton@google.com> | 2016-06-10 14:06:32 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-10 14:06:32 -0700 |
| commit | 2b5f2cbf0d0b580e5277d1d085ce261cb5233111 (patch) | |
| tree | 8eb0c0d1525a71b06e6becf6bd71c60f3247847b /src/gpu/gl | |
| parent | f10637f2795b147751ef413237389d230b869360 (diff) | |
Move multisampleDisableSupport into GrCaps
Non-platform code needs this information in order to make rendering
decisions.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2062443002
Review-Url: https://codereview.chromium.org/2062443002
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLCaps.h | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 7ca2bf9a47..5370f792c6 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -37,7 +37,6 @@ GrGLCaps::GrGLCaps(const GrContextOptions& contextOptions, fDirectStateAccessSupport = false; fDebugSupport = false; fES2CompatibilitySupport = false; - fMultisampleDisableSupport = false; fDrawIndirectSupport = false; fMultiDrawIndirectSupport = false; fBaseInstanceSupport = false; @@ -1107,7 +1106,6 @@ SkString GrGLCaps::dump() const { r.appendf("Vertex array object support: %s\n", (fVertexArrayObjectSupport ? "YES": "NO")); r.appendf("Direct state access support: %s\n", (fDirectStateAccessSupport ? "YES": "NO")); r.appendf("Debug support: %s\n", (fDebugSupport ? "YES": "NO")); - r.appendf("Multisample disable support: %s\n", (fMultisampleDisableSupport ? "YES" : "NO")); r.appendf("Draw indirect support: %s\n", (fDrawIndirectSupport ? "YES" : "NO")); r.appendf("Multi draw indirect support: %s\n", (fMultiDrawIndirectSupport ? "YES" : "NO")); r.appendf("Base instance support: %s\n", (fBaseInstanceSupport ? "YES" : "NO")); diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h index 58bf98c2d0..0cb353aa9f 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/gl/GrGLCaps.h @@ -296,9 +296,6 @@ public: /// Is there support for ES2 compatability? bool ES2CompatibilitySupport() const { return fES2CompatibilitySupport; } - /// Can we call glDisable(GL_MULTISAMPLE)? - bool multisampleDisableSupport() const { return fMultisampleDisableSupport; } - /// Is there support for glDraw*Indirect? Note that the baseInstance fields of indirect draw /// commands cannot be used unless we have base instance support. bool drawIndirectSupport() const { return fDrawIndirectSupport; } @@ -398,7 +395,6 @@ private: bool fDirectStateAccessSupport : 1; bool fDebugSupport : 1; bool fES2CompatibilitySupport : 1; - bool fMultisampleDisableSupport : 1; bool fDrawIndirectSupport : 1; bool fMultiDrawIndirectSupport : 1; bool fBaseInstanceSupport : 1; diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 5d6b7ac2e7..de60be6b06 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2991,7 +2991,7 @@ void GrGLGpu::flushHWAAState(GrRenderTarget* rt, bool useHWAA, bool stencilEnabl SkASSERT(rt || !useHWAA); SkASSERT(!useHWAA || rt->isStencilBufferMultisampled()); - if (this->glCaps().multisampleDisableSupport()) { + if (this->caps()->multisampleDisableSupport()) { if (useHWAA) { if (kYes_TriState != fMSAAEnabled) { GL_CALL(Enable(GR_GL_MULTISAMPLE)); |