diff options
| author |  bsalomon <bsalomon@google.com> | 2016-11-08 13:26:24 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-11-08 13:26:24 -0800 |
| commit | 2c3db3263bdc4b91cd7d21dbfe0501fe9bd476a5 (patch) | |
| tree | ee8d83a3ba4a771c0f7c48aa0a5b1ce63d1dfd78 /src/gpu/gl/GrGLCaps.cpp | |
| parent | bf111d7bc9ba3857433e30eae27f0272c34ed0fb (diff) | |
Fix query for GR_GL_IMPLEMENTATION_COLOR_READ_FORMAT for GrPixelConfigs that aren't renderable
We recently separated renderabibilty by Skia from FBO-bindable ( https://skia-review.googlesource.com/4345). Overlooked in that change was the necessity to be able to query GR_GL_IMPLEMENTATION_COLOR_READ_FORMAT and _TYPE for formats that we don't support rendering to Skia but are legal color attachment formats.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2489643002
Review-Url: https://codereview.chromium.org/2489643002
Diffstat (limited to 'src/gpu/gl/GrGLCaps.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 0af5c57a3e..a37d0e093f 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -855,7 +855,8 @@ bool GrGLCaps::hasPathRenderingSupport(const GrGLContextInfo& ctxInfo, const GrG bool GrGLCaps::readPixelsSupported(GrPixelConfig surfaceConfig, GrPixelConfig readConfig, std::function<void (GrGLenum, GrGLint*)> getIntegerv, - std::function<bool ()> bindRenderTarget) const { + std::function<bool ()> bindRenderTarget, + std::function<void ()> unbindRenderTarget) const { // If it's not possible to even have a color attachment of surfaceConfig then read pixels is // not supported regardless of readConfig. if (!this->canConfigBeFBOColorAttachment(surfaceConfig)) { @@ -912,6 +913,7 @@ bool GrGLCaps::readPixelsSupported(GrPixelConfig surfaceConfig, getIntegerv(GR_GL_IMPLEMENTATION_COLOR_READ_TYPE, &type); rpFormat->fFormat = format; rpFormat->fType = type; + unbindRenderTarget(); } return fConfigTable[surfaceConfig].fSecondReadPixelsFormat.fFormat == readFormat && |