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 am: e136aba4ad

Browse Source 
am: e105927fa4

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

Change-Id: I5fe170f0ec7ac82f4502b545fb756cc9df51f0fb
This commit is contained in:
sergeyv
2016-06-02 01:58:15 +00:00
committed by android-build-merger
parent 14afcc803f e105927fa4
commit 91ae5e8209
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;
}