Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check if layer is created in detachSurfaceTexture"

Browse Source
This commit is contained in:
Sergei Vasilinetc
2017-02-03 01:08:23 +00:00
committed by Android (Google) Code Review
parent beef0ce5e1 db92bb71d0
commit 16e211832e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hwui/DeferredLayerUpdater.cpp
View File

@@ -169,13 +169,15 @@ void DeferredLayerUpdater::updateLayer(bool forceFilter, GLenum renderTarget,
void DeferredLayerUpdater::detachSurfaceTexture() {
if (mSurfaceTexture.get()) {
if (mLayer->getApi() == Layer::Api::OpenGL) {
if (mLayerApi == Layer::Api::OpenGL) {
status_t err = mSurfaceTexture->detachFromContext();
if (err != 0) {
// TODO: Elevate to fatal exception
ALOGE("Failed to detach SurfaceTexture from context %d", err);
}
static_cast<GlLayer*>(mLayer)->clearTexture();
if (mLayer) {
static_cast<GlLayer*>(mLayer)->clearTexture();
}
}
mSurfaceTexture = nullptr;
}