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

Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f

Browse Source 
am: f1eb9c63ee

* commit 'f1eb9c63ee1eeff9aa4126cde0f0fbe7fbf72efd':
  HWUI: do not call glCopyTexSubImage2D on empty area.

Change-Id: I7e28da73c43fd45a9c417a4bf1d9c4d4ee80a8bf
This commit is contained in:
Sergei Vasilinetc
2016-06-02 01:50:58 +00:00
committed by android-build-merger
parent 0152c3391d f1eb9c63ee
commit df35dc4db6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/hwui/BakedOpRenderer.cpp
View File

@@ -96,15 +96,15 @@ void BakedOpRenderer::endLayer() {
}
OffscreenBuffer* BakedOpRenderer::copyToLayer(const Rect& area) {
OffscreenBuffer* buffer = mRenderState.layerPool().get(mRenderState,
area.getWidth(), area.getHeight());
if (!area.isEmpty()) {
const uint32_t width = area.getWidth();
const uint32_t height = area.getHeight();
OffscreenBuffer* buffer = mRenderState.layerPool().get(mRenderState, width, height);
if (!area.isEmpty() && width != 0 && height != 0) {
mCaches.textureState().activateTexture(0);
mCaches.textureState().bindTexture(buffer->texture.id());
glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
area.left, mRenderTarget.viewportHeight - area.bottom,
area.getWidth(), area.getHeight());
area.left, mRenderTarget.viewportHeight - area.bottom, width, height);
}
return buffer;
}