diff options
author | robertphillips <robertphillips@google.com> | 2016-05-04 12:47:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-04 12:47:41 -0700 |
commit | 76948d4faaca9fd7730576e2f79790ca8d93c10b (patch) | |
tree | 702a78ad811ecb9ab0f96d07eee64ecdf8191bd1 /src/gpu/gl/GrGLGpu.cpp | |
parent | c4025189d31efcb0d54bf14b7712b38725f86c13 (diff) |
Add Gr*Proxy classes
This isn't wired in anywhere yet.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1937553002
Committed: https://skia.googlesource.com/skia/+/de5bf0cfeca908b81a28cc50065f7bc2da3d2fd1
Committed: https://skia.googlesource.com/skia/+/92605b35efa0155c44d24bd8415b4cc1db8831db
Review-Url: https://codereview.chromium.org/1937553002
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 9d2984f186..027d9527c0 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -1474,9 +1474,9 @@ bool GrGLGpu::createRenderTargetObjects(const GrSurfaceDesc& desc, idDesc->fRTFBOID = 0; idDesc->fRTFBOOwnership = GrBackendObjectOwnership::kOwned; idDesc->fTexFBOID = 0; - idDesc->fSampleConfig = (GrGLCaps::kMixedSamples_MSFBOType == this->glCaps().msFBOType() && - desc.fSampleCnt > 0) ? GrRenderTarget::kStencil_SampleConfig : - GrRenderTarget::kUnified_SampleConfig; + SkASSERT((GrGLCaps::kMixedSamples_MSFBOType == this->glCaps().msFBOType()) == + this->caps()->usesMixedSamples()); + idDesc->fSampleConfig = GrRenderTarget::ComputeSampleConfig(*this->caps(), desc.fSampleCnt); GrGLenum status; |