Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 101ae3bb authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Move DisplayList to its own cpp file"

parents 7b3745fe 0776a606

libs/hwui/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
		FontRenderer.cpp \

		GammaFontRenderer.cpp \

		Caches.cpp \

		DisplayList.cpp \

		DisplayListLogBuffer.cpp \

		DisplayListRenderer.cpp \

		Dither.cpp \

libs/hwui/DisplayList.cpp

0 → 100644
+436 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "DisplayList.h"

#include "DisplayListOp.h"

#include "DisplayListLogBuffer.h"



namespace android {

namespace uirenderer {



void DisplayList::outputLogBuffer(int fd) {

    DisplayListLogBuffer& logBuffer = DisplayListLogBuffer::getInstance();

    if (logBuffer.isEmpty()) {

        return;

    }



    FILE *file = fdopen(fd, "a");



    fprintf(file, "\nRecent DisplayList operations\n");

    logBuffer.outputCommands(file);



    String8 cachesLog;

    Caches::getInstance().dumpMemoryUsage(cachesLog);

    fprintf(file, "\nCaches:\n%s", cachesLog.string());

    fprintf(file, "\n");



    fflush(file);

}



DisplayList::DisplayList(const DisplayListRenderer& recorder) :

    mTransformMatrix(NULL), mTransformCamera(NULL), mTransformMatrix3D(NULL),

    mStaticMatrix(NULL), mAnimationMatrix(NULL) {



    initFromDisplayListRenderer(recorder);

}



DisplayList::~DisplayList() {

    clearResources();

}



void DisplayList::destroyDisplayListDeferred(DisplayList* displayList) {

    if (displayList) {

        DISPLAY_LIST_LOGD("Deferring display list destruction");

        Caches::getInstance().deleteDisplayListDeferred(displayList);

    }

}



void DisplayList::clearResources() {

    mDisplayListData = NULL;

    delete mTransformMatrix;

    delete mTransformCamera;

    delete mTransformMatrix3D;

    delete mStaticMatrix;

    delete mAnimationMatrix;



    mTransformMatrix = NULL;

    mTransformCamera = NULL;

    mTransformMatrix3D = NULL;

    mStaticMatrix = NULL;

    mAnimationMatrix = NULL;



    Caches& caches = Caches::getInstance();

    caches.unregisterFunctors(mFunctorCount);

    caches.resourceCache.lock();



    for (size_t i = 0; i < mBitmapResources.size(); i++) {

        caches.resourceCache.decrementRefcountLocked(mBitmapResources.itemAt(i));

    }



    for (size_t i = 0; i < mOwnedBitmapResources.size(); i++) {

        SkBitmap* bitmap = mOwnedBitmapResources.itemAt(i);

        caches.resourceCache.decrementRefcountLocked(bitmap);

        caches.resourceCache.destructorLocked(bitmap);

    }



    for (size_t i = 0; i < mFilterResources.size(); i++) {

        caches.resourceCache.decrementRefcountLocked(mFilterResources.itemAt(i));

    }



    for (size_t i = 0; i < mShaders.size(); i++) {

        caches.resourceCache.decrementRefcountLocked(mShaders.itemAt(i));

        caches.resourceCache.destructorLocked(mShaders.itemAt(i));

    }



    for (size_t i = 0; i < mSourcePaths.size(); i++) {

        caches.resourceCache.decrementRefcountLocked(mSourcePaths.itemAt(i));

    }



    for (size_t i = 0; i < mLayers.size(); i++) {

        caches.resourceCache.decrementRefcountLocked(mLayers.itemAt(i));

    }



    caches.resourceCache.unlock();



    for (size_t i = 0; i < mPaints.size(); i++) {

        delete mPaints.itemAt(i);

    }



    for (size_t i = 0; i < mRegions.size(); i++) {

        delete mRegions.itemAt(i);

    }



    for (size_t i = 0; i < mPaths.size(); i++) {

        SkPath* path = mPaths.itemAt(i);

        caches.pathCache.remove(path);

        delete path;

    }



    for (size_t i = 0; i < mMatrices.size(); i++) {

        delete mMatrices.itemAt(i);

    }



    mBitmapResources.clear();

    mOwnedBitmapResources.clear();

    mFilterResources.clear();

    mShaders.clear();

    mSourcePaths.clear();

    mPaints.clear();

    mRegions.clear();

    mPaths.clear();

    mMatrices.clear();

    mLayers.clear();

}



void DisplayList::reset() {

    clearResources();

    init();

}



void DisplayList::initFromDisplayListRenderer(const DisplayListRenderer& recorder, bool reusing) {

    if (reusing) {

        // re-using display list - clear out previous allocations

        clearResources();

    }



    init();



    mDisplayListData = recorder.getDisplayListData();

    mSize = mDisplayListData->allocator.usedSize();



    if (mSize == 0) {

        return;

    }



    mFunctorCount = recorder.getFunctorCount();



    Caches& caches = Caches::getInstance();

    caches.registerFunctors(mFunctorCount);

    caches.resourceCache.lock();



    const Vector<SkBitmap*>& bitmapResources = recorder.getBitmapResources();

    for (size_t i = 0; i < bitmapResources.size(); i++) {

        SkBitmap* resource = bitmapResources.itemAt(i);

        mBitmapResources.add(resource);

        caches.resourceCache.incrementRefcountLocked(resource);

    }



    const Vector<SkBitmap*> &ownedBitmapResources = recorder.getOwnedBitmapResources();

    for (size_t i = 0; i < ownedBitmapResources.size(); i++) {

        SkBitmap* resource = ownedBitmapResources.itemAt(i);

        mOwnedBitmapResources.add(resource);

        caches.resourceCache.incrementRefcountLocked(resource);

    }



    const Vector<SkiaColorFilter*>& filterResources = recorder.getFilterResources();

    for (size_t i = 0; i < filterResources.size(); i++) {

        SkiaColorFilter* resource = filterResources.itemAt(i);

        mFilterResources.add(resource);

        caches.resourceCache.incrementRefcountLocked(resource);

    }



    const Vector<SkiaShader*>& shaders = recorder.getShaders();

    for (size_t i = 0; i < shaders.size(); i++) {

        SkiaShader* resource = shaders.itemAt(i);

        mShaders.add(resource);

        caches.resourceCache.incrementRefcountLocked(resource);

    }



    const SortedVector<SkPath*>& sourcePaths = recorder.getSourcePaths();

    for (size_t i = 0; i < sourcePaths.size(); i++) {

        mSourcePaths.add(sourcePaths.itemAt(i));

        caches.resourceCache.incrementRefcountLocked(sourcePaths.itemAt(i));

    }



    const Vector<Layer*>& layers = recorder.getLayers();

    for (size_t i = 0; i < layers.size(); i++) {

        mLayers.add(layers.itemAt(i));

        caches.resourceCache.incrementRefcountLocked(layers.itemAt(i));

    }



    caches.resourceCache.unlock();



    mPaints.appendVector(recorder.getPaints());

    mRegions.appendVector(recorder.getRegions());

    mPaths.appendVector(recorder.getPaths());

    mMatrices.appendVector(recorder.getMatrices());

}



void DisplayList::init() {

    mSize = 0;

    mIsRenderable = true;

    mFunctorCount = 0;

    mLeft = 0;

    mTop = 0;

    mRight = 0;

    mBottom = 0;

    mClipChildren = true;

    mAlpha = 1;

    mMultipliedAlpha = 255;

    mHasOverlappingRendering = true;

    mTranslationX = 0;

    mTranslationY = 0;

    mRotation = 0;

    mRotationX = 0;

    mRotationY= 0;

    mScaleX = 1;

    mScaleY = 1;

    mPivotX = 0;

    mPivotY = 0;

    mCameraDistance = 0;

    mMatrixDirty = false;

    mMatrixFlags = 0;

    mPrevWidth = -1;

    mPrevHeight = -1;

    mWidth = 0;

    mHeight = 0;

    mPivotExplicitlySet = false;

    mCaching = false;

}



size_t DisplayList::getSize() {

    return mSize;

}



/**

 * This function is a simplified version of replay(), where we simply retrieve and log the

 * display list. This function should remain in sync with the replay() function.

 */

void DisplayList::output(uint32_t level) {

    ALOGD("%*sStart display list (%p, %s, render=%d)", level * 2, "", this,

            mName.string(), isRenderable());



    ALOGD("%*s%s %d", level * 2, "", "Save", SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);

    outputViewProperties(level);

    int flags = DisplayListOp::kOpLogFlag_Recurse;

    for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {

        mDisplayListData->displayListOps[i]->output(level, flags);

    }

    ALOGD("%*sDone (%p, %s)", level * 2, "", this, mName.string());

}



void DisplayList::updateMatrix() {

    if (mMatrixDirty) {

        if (!mTransformMatrix) {

            mTransformMatrix = new SkMatrix();

        }

        if (mMatrixFlags == 0 || mMatrixFlags == TRANSLATION) {

            mTransformMatrix->reset();

        } else {

            if (!mPivotExplicitlySet) {

                if (mWidth != mPrevWidth || mHeight != mPrevHeight) {

                    mPrevWidth = mWidth;

                    mPrevHeight = mHeight;

                    mPivotX = mPrevWidth / 2;

                    mPivotY = mPrevHeight / 2;

                }

            }

            if ((mMatrixFlags & ROTATION_3D) == 0) {

                mTransformMatrix->setTranslate(mTranslationX, mTranslationY);

                mTransformMatrix->preRotate(mRotation, mPivotX, mPivotY);

                mTransformMatrix->preScale(mScaleX, mScaleY, mPivotX, mPivotY);

            } else {

                if (!mTransformCamera) {

                    mTransformCamera = new Sk3DView();

                    mTransformMatrix3D = new SkMatrix();

                }

                mTransformMatrix->reset();

                mTransformCamera->save();

                mTransformMatrix->preScale(mScaleX, mScaleY, mPivotX, mPivotY);

                mTransformCamera->rotateX(mRotationX);

                mTransformCamera->rotateY(mRotationY);

                mTransformCamera->rotateZ(-mRotation);

                mTransformCamera->getMatrix(mTransformMatrix3D);

                mTransformMatrix3D->preTranslate(-mPivotX, -mPivotY);

                mTransformMatrix3D->postTranslate(mPivotX + mTranslationX,

                        mPivotY + mTranslationY);

                mTransformMatrix->postConcat(*mTransformMatrix3D);

                mTransformCamera->restore();

            }

        }

        mMatrixDirty = false;

    }

}



void DisplayList::outputViewProperties(uint32_t level) {

    updateMatrix();

    if (mLeft != 0 || mTop != 0) {

        ALOGD("%*sTranslate (left, top) %d, %d", level * 2, "", mLeft, mTop);

    }

    if (mStaticMatrix) {

        ALOGD("%*sConcatMatrix (static) %p: " MATRIX_STRING,

                level * 2, "", mStaticMatrix, MATRIX_ARGS(mStaticMatrix));

    }

    if (mAnimationMatrix) {

        ALOGD("%*sConcatMatrix (animation) %p: " MATRIX_STRING,

                level * 2, "", mAnimationMatrix, MATRIX_ARGS(mStaticMatrix));

    }

    if (mMatrixFlags != 0) {

        if (mMatrixFlags == TRANSLATION) {

            ALOGD("%*sTranslate %f, %f", level * 2, "", mTranslationX, mTranslationY);

        } else {

            ALOGD("%*sConcatMatrix %p: " MATRIX_STRING,

                    level * 2, "", mTransformMatrix, MATRIX_ARGS(mTransformMatrix));

        }

    }

    if (mAlpha < 1 && !mCaching) {

        if (!mHasOverlappingRendering) {

            ALOGD("%*sSetAlpha %.2f", level * 2, "", mAlpha);

        } else {

            int flags = SkCanvas::kHasAlphaLayer_SaveFlag;

            if (mClipChildren) {

                flags |= SkCanvas::kClipToLayer_SaveFlag;

            }

            ALOGD("%*sSaveLayerAlpha %.2f, %.2f, %.2f, %.2f, %d, 0x%x", level * 2, "",

                    (float) 0, (float) 0, (float) mRight - mLeft, (float) mBottom - mTop,

                    mMultipliedAlpha, flags);

        }

    }

    if (mClipChildren && !mCaching) {

        ALOGD("%*sClipRect %.2f, %.2f, %.2f, %.2f", level * 2, "", 0.0f, 0.0f,

                (float) mRight - mLeft, (float) mBottom - mTop);

    }

}



void DisplayList::setViewProperties(OpenGLRenderer& renderer, uint32_t level) {

#if DEBUG_DISPLAYLIST

    outputViewProperties(level);

#endif

    updateMatrix();

    if (mLeft != 0 || mTop != 0) {

        renderer.translate(mLeft, mTop);

    }

    if (mStaticMatrix) {

        renderer.concatMatrix(mStaticMatrix);

    } else if (mAnimationMatrix) {

        renderer.concatMatrix(mAnimationMatrix);

    }

    if (mMatrixFlags != 0) {

        if (mMatrixFlags == TRANSLATION) {

            renderer.translate(mTranslationX, mTranslationY);

        } else {

            renderer.concatMatrix(mTransformMatrix);

        }

    }

    if (mAlpha < 1 && !mCaching) {

        if (!mHasOverlappingRendering) {

            renderer.setAlpha(mAlpha);

        } else {

            // TODO: should be able to store the size of a DL at record time and not

            // have to pass it into this call. In fact, this information might be in the

            // location/size info that we store with the new native transform data.

            int flags = SkCanvas::kHasAlphaLayer_SaveFlag;

            if (mClipChildren) {

                flags |= SkCanvas::kClipToLayer_SaveFlag;

            }

            renderer.saveLayerAlpha(0, 0, mRight - mLeft, mBottom - mTop,

                    mMultipliedAlpha, flags);

        }

    }

    if (mClipChildren && !mCaching) {

        renderer.clipRect(0, 0, mRight - mLeft, mBottom - mTop,

                SkRegion::kIntersect_Op);

    }

}



status_t DisplayList::replay(OpenGLRenderer& renderer, Rect& dirty, int32_t flags, uint32_t level) {

    status_t drawGlStatus = DrawGlInfo::kStatusDone;



#if DEBUG_DISPLAY_LIST

    Rect* clipRect = renderer.getClipRect();

    DISPLAY_LIST_LOGD("%*sStart display list (%p, %s), clipRect: %.0f, %.f, %.0f, %.0f",

            (level+1)*2, "", this, mName.string(), clipRect->left, clipRect->top,

            clipRect->right, clipRect->bottom);

#endif



    renderer.startMark(mName.string());



    int restoreTo = renderer.save(SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);

    DISPLAY_LIST_LOGD("%*sSave %d %d", level * 2, "",

            SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag, restoreTo);

    setViewProperties(renderer, level);



    if (renderer.quickRejectNoScissor(0, 0, mWidth, mHeight)) {

        DISPLAY_LIST_LOGD("%*sRestoreToCount %d", level * 2, "", restoreTo);

        renderer.restoreToCount(restoreTo);

        renderer.endMark();

        return drawGlStatus;

    }



    DisplayListLogBuffer& logBuffer = DisplayListLogBuffer::getInstance();

    int saveCount = renderer.getSaveCount() - 1;

    for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {

        DisplayListOp *op = mDisplayListData->displayListOps[i];

#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS

        Caches::getInstance().eventMark(strlen(op->name()), op->name());

#endif



        drawGlStatus |= op->replay(renderer, dirty, flags,

                saveCount, level, mCaching, mMultipliedAlpha);

        logBuffer.writeCommand(level, op->name());

    }



    DISPLAY_LIST_LOGD("%*sRestoreToCount %d", level * 2, "", restoreTo);

    renderer.restoreToCount(restoreTo);

    renderer.endMark();



    DISPLAY_LIST_LOGD("%*sDone (%p, %s), returning %d", (level + 1) * 2, "", this, mName.string(),

            drawGlStatus);

    return drawGlStatus;

}



}; // namespace uirenderer

}; // namespace android

libs/hwui/DisplayList.h

0 → 100644
+422 −0

File added.

Preview size limit exceeded, changes collapsed.

libs/hwui/DisplayListOp.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


#include <SkXfermode.h>



#include <private/hwui/DrawGlInfo.h>



#include "OpenGLRenderer.h"

#include "DisplayListRenderer.h"

#include "utils/LinearAllocator.h"

libs/hwui/DisplayListRenderer.cpp

+1 −419

File changed.

Preview size limit exceeded, changes collapsed.