diff options
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 685fddc..eb4b83b 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -236,7 +236,7 @@ void OpenGLRenderer::resume() { glBlendEquation(GL_FUNC_ADD); } -bool OpenGLRenderer::callDrawGLFunction(Functor *functor, Rect& dirty) { +status_t OpenGLRenderer::callDrawGLFunction(Functor *functor, Rect& dirty) { interrupt(); if (mDirtyClip) { setScissorFromClip(); @@ -269,7 +269,7 @@ bool OpenGLRenderer::callDrawGLFunction(Functor *functor, Rect& dirty) { } resume(); - return result != 0; + return result; } /////////////////////////////////////////////////////////////////////////////// @@ -1321,21 +1321,10 @@ void OpenGLRenderer::finishDrawTexture() { // Drawing /////////////////////////////////////////////////////////////////////////////// -bool OpenGLRenderer::drawDisplayList(DisplayList* displayList, uint32_t width, uint32_t height, +status_t OpenGLRenderer::drawDisplayList(DisplayList* displayList, uint32_t width, uint32_t height, Rect& dirty, int32_t flags, uint32_t level) { - float top = 0; - float left = 0; - float right = width; - float bottom = height; - if (USE_DISPLAY_LIST_PROPERTIES) { - Rect transformedRect; - displayList->transformRect(left, top, right, bottom, transformedRect); - left = transformedRect.left; - top = transformedRect.top; - right = transformedRect.right; - bottom = transformedRect.bottom; - } - if (quickReject(left, top, right, bottom)) { + + if (!USE_DISPLAY_LIST_PROPERTIES && quickReject(0, 0, width, height)) { return false; } @@ -1345,7 +1334,7 @@ bool OpenGLRenderer::drawDisplayList(DisplayList* displayList, uint32_t width, u return displayList->replay(*this, width, height, dirty, flags, level); } - return false; + return DrawGlInfo::kStatusDone; } void OpenGLRenderer::outputDisplayList(DisplayList* displayList, uint32_t level) { |