ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am c0384266: am f45c5100: partially implement external display clipping

Browse Source 
* commit 'c0384266699aadd23a11bcdfd8a92f6dae8bf36c':
  partially implement external display clipping
This commit is contained in:
Mathias Agopian 2012-10-25 17:32:17 -07:00 committed by Android Git Automerger
commit e8966b349f
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -1500,6 +1500,28 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const
drawWormhole(hw, region);
}
}
if (hw->getDisplayType() >= DisplayDevice::DISPLAY_EXTERNAL) {
// TODO: just to be on the safe side, we don't set the
// scissor on the main display. It should never be needed
// anyways (though in theory it could since the API allows it).
const Rect& bounds(hw->getBounds());
const Transform& tr(hw->getTransform());
const Rect scissor(tr.transform(hw->getViewport()));
if (scissor != bounds) {
// scissor doesn't match the screen's dimensions, so we
// need to clear everything outside of it and enable
// the GL scissor so we don't draw anything where we shouldn't
const GLint height = hw->getHeight();
glScissor(scissor.left, height - scissor.bottom,
scissor.getWidth(), scissor.getHeight());
// clear everything unscissored
glClearColor(0, 0, 0, 0);
glClear(GL_COLOR_BUFFER_BIT);
// enable scissor for this frame
glEnable(GL_SCISSOR_TEST);
}
}
}
/*
@ -1552,6 +1574,9 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const
}
}
}
// disable scissor at the end of the frame
glDisable(GL_SCISSOR_TEST);
}
void SurfaceFlinger::drawWormhole(const sp<const DisplayDevice>& hw,