diff options
| author | Diego Wilson <diegowilson@google.com> | 2018-11-20 11:38:33 -0800 |
|---|---|---|
| committer | Bill Peckham <bpeckham@google.com> | 2018-12-05 17:57:49 -0800 |
| commit | b76115be4efabffaa6febc57cec47acc2f933c79 (patch) | |
| tree | 3c75adb1327eb78655b3bd8e1fd47db1a650b233 /libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp | |
| parent | b1a0dd53db11fb24b5937212720aa92fa70b4fdd (diff) | |
| parent | 5a05000482abc03a74556ae0e289172eb0ae5607 (diff) | |
Merge QP1A.181119.002
Change-Id: Ieb6ae3730e8b01f867f9b5120de1ab3067653d21
Diffstat (limited to 'libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp')
| -rw-r--r-- | libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp index d401b385075e..6ae59990d0ab 100644 --- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp @@ -164,7 +164,11 @@ bool SkiaOpenGLPipeline::setSurface(Surface* surface, SwapBehavior swapBehavior, if (surface) { mRenderThread.requireGlContext(); - mEglSurface = mEglManager.createSurface(surface, colorMode); + auto newSurface = mEglManager.createSurface(surface, colorMode); + if (!newSurface) { + return false; + } + mEglSurface = newSurface.unwrap(); } if (colorMode == ColorMode::SRGB) { |