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

Commit 14e51305 authored by Chris Craik's avatar Chris Craik
Browse files

Move Snapshot management to intermediate StatefulBaseRenderer class 

The eventual goal is for the StatefulBaseRenderer to serve as the
common base class between the DisplayListRenderer and OpenGLRenderer.

This will separate DisplayList recording, Snapshot stack management,
and the GL in OpenGLRenderer.

Additionally, avoid sp<> parameters, and use const parameters in
several places, with the intent of greatly reducing the surface area
where renderer subclasses can modify snapshot stack.

Next steps:
-move bulk of clipping logic into StatefulBaseRenderer
-disable direct snapshot access

Change-Id: Ibc3c6747134ec7daf8ea535866239fa73b874390
parent 539394ec

libs/hwui/Android.mk

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

		SkiaShader.cpp \

		Snapshot.cpp \

		StatefulBaseRenderer.cpp \

		Stencil.cpp \

		Texture.cpp \

		TextureCache.cpp \

libs/hwui/DisplayListRenderer.cpp

+12 −17
Original line number Diff line number Diff line
@@ -120,19 +120,14 @@ void DisplayListRenderer::setViewport(int width, int height) { 
    // TODO: DisplayListRenderer shouldn't have a projection matrix, as it should never be used

    mViewProjMatrix.loadOrtho(0, width, height, 0, -1, 1);



    mWidth = width;

    mHeight = height;

    initializeViewport(width, height);

}



status_t DisplayListRenderer::prepareDirty(float left, float top,

        float right, float bottom, bool opaque) {

    mSnapshot = new Snapshot(mFirstSnapshot,

            SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);

    mSaveCount = 1;

    initializeSaveStack(0, 0, getWidth(), getHeight());



    mSnapshot->setClip(0.0f, 0.0f, mWidth, mHeight);

    mDirtyClip = opaque;



    mRestoreSaveCount = -1;



    return DrawGlInfo::kStatusDone; // No invalidate needed at record-time
@@ -158,7 +153,7 @@ status_t DisplayListRenderer::callDrawGLFunction(Functor *functor, Rect& dirty) 


int DisplayListRenderer::save(int flags) {

    addStateOp(new (alloc()) SaveOp(flags));

    return OpenGLRenderer::save(flags);

    return StatefulBaseRenderer::save(flags);

}



void DisplayListRenderer::restore() {
@@ -169,19 +164,19 @@ void DisplayListRenderer::restore() { 


    mRestoreSaveCount--;

    insertTranslate();

    OpenGLRenderer::restore();

    StatefulBaseRenderer::restore();

}



void DisplayListRenderer::restoreToCount(int saveCount) {

    mRestoreSaveCount = saveCount;

    insertTranslate();

    OpenGLRenderer::restoreToCount(saveCount);

    StatefulBaseRenderer::restoreToCount(saveCount);

}



int DisplayListRenderer::saveLayer(float left, float top, float right, float bottom,

        int alpha, SkXfermode::Mode mode, int flags) {

    addStateOp(new (alloc()) SaveLayerOp(left, top, right, bottom, alpha, mode, flags));

    return OpenGLRenderer::save(flags);

    return StatefulBaseRenderer::save(flags);

}



void DisplayListRenderer::translate(float dx, float dy, float dz) {
@@ -190,34 +185,34 @@ void DisplayListRenderer::translate(float dx, float dy, float dz) { 
    mTranslateX += dx;

    mTranslateY += dy;

    insertRestoreToCount();

    OpenGLRenderer::translate(dx, dy, dz);

    StatefulBaseRenderer::translate(dx, dy, dz);

}



void DisplayListRenderer::rotate(float degrees) {

    addStateOp(new (alloc()) RotateOp(degrees));

    OpenGLRenderer::rotate(degrees);

    StatefulBaseRenderer::rotate(degrees);

}



void DisplayListRenderer::scale(float sx, float sy) {

    addStateOp(new (alloc()) ScaleOp(sx, sy));

    OpenGLRenderer::scale(sx, sy);

    StatefulBaseRenderer::scale(sx, sy);

}



void DisplayListRenderer::skew(float sx, float sy) {

    addStateOp(new (alloc()) SkewOp(sx, sy));

    OpenGLRenderer::skew(sx, sy);

    StatefulBaseRenderer::skew(sx, sy);

}



void DisplayListRenderer::setMatrix(SkMatrix* matrix) {

    matrix = refMatrix(matrix);

    addStateOp(new (alloc()) SetMatrixOp(matrix));

    OpenGLRenderer::setMatrix(matrix);

    StatefulBaseRenderer::setMatrix(matrix);

}



void DisplayListRenderer::concatMatrix(SkMatrix* matrix) {

    matrix = refMatrix(matrix);

    addStateOp(new (alloc()) ConcatMatrixOp(matrix));

    OpenGLRenderer::concatMatrix(matrix);

    StatefulBaseRenderer::concatMatrix(matrix);

}



bool DisplayListRenderer::clipRect(float left, float top, float right, float bottom,

libs/hwui/DisplayListRenderer.h

+47 −22
Original line number Diff line number Diff line
@@ -65,22 +65,26 @@ public: 


    virtual bool isRecording() { return true; }



// ----------------------------------------------------------------------------

// Frame state operations

// ----------------------------------------------------------------------------

    virtual void setViewport(int width, int height);

    virtual status_t prepareDirty(float left, float top, float right, float bottom, bool opaque);

    virtual void finish();



    virtual status_t callDrawGLFunction(Functor *functor, Rect& dirty);



    virtual void interrupt();

    virtual void resume();



// ----------------------------------------------------------------------------

// Canvas state operations

// ----------------------------------------------------------------------------

    // Save (layer)

    virtual int save(int flags);

    virtual void restore();

    virtual void restoreToCount(int saveCount);



    virtual int saveLayer(float left, float top, float right, float bottom,

            int alpha, SkXfermode::Mode mode, int flags);



    // Matrix

    virtual void translate(float dx, float dy, float dz);

    virtual void rotate(float degrees);

    virtual void scale(float sx, float sy);
@@ -89,12 +93,30 @@ public: 
    virtual void setMatrix(SkMatrix* matrix);

    virtual void concatMatrix(SkMatrix* matrix);



    // Clip

    virtual bool clipRect(float left, float top, float right, float bottom, SkRegion::Op op);

    virtual bool clipPath(SkPath* path, SkRegion::Op op);

    virtual bool clipRegion(SkRegion* region, SkRegion::Op op);



    virtual status_t drawDisplayList(DisplayList* displayList, Rect& dirty, int32_t flags);

    virtual status_t drawLayer(Layer* layer, float x, float y);

    // Misc - should be implemented with SkPaint inspection

    virtual void resetShader();

    virtual void setupShader(SkiaShader* shader);



    virtual void resetColorFilter();

    virtual void setupColorFilter(SkiaColorFilter* filter);



    virtual void resetShadow();

    virtual void setupShadow(float radius, float dx, float dy, int color);



    virtual void resetPaintFilter();

    virtual void setupPaintFilter(int clearBits, int setBits);



// ----------------------------------------------------------------------------

// Canvas draw operations

// ----------------------------------------------------------------------------

    virtual status_t drawColor(int color, SkXfermode::Mode mode);



    // Bitmap-based

    virtual status_t drawBitmap(SkBitmap* bitmap, float left, float top, SkPaint* paint);

    virtual status_t drawBitmap(SkBitmap* bitmap, SkMatrix* matrix, SkPaint* paint);

    virtual status_t drawBitmap(SkBitmap* bitmap, float srcLeft, float srcTop,
@@ -105,8 +127,10 @@ public: 
            float* vertices, int* colors, SkPaint* paint);

    virtual status_t drawPatch(SkBitmap* bitmap, Res_png_9patch* patch,

            float left, float top, float right, float bottom, SkPaint* paint);

    virtual status_t drawColor(int color, SkXfermode::Mode mode);



    // Shapes

    virtual status_t drawRect(float left, float top, float right, float bottom, SkPaint* paint);

    virtual status_t drawRects(const float* rects, int count, SkPaint* paint);

    virtual status_t drawRoundRect(float left, float top, float right, float bottom,

            float rx, float ry, SkPaint* paint);

    virtual status_t drawCircle(float x, float y, float radius, SkPaint* paint);
@@ -116,28 +140,29 @@ public: 
    virtual status_t drawPath(SkPath* path, SkPaint* paint);

    virtual status_t drawLines(float* points, int count, SkPaint* paint);

    virtual status_t drawPoints(float* points, int count, SkPaint* paint);



    // Text

    virtual status_t drawText(const char* text, int bytesCount, int count, float x, float y,

            const float* positions, SkPaint* paint, float totalAdvance, const Rect& bounds,

            DrawOpMode drawOpMode = kDrawOpMode_Immediate);

    virtual status_t drawTextOnPath(const char* text, int bytesCount, int count, SkPath* path,

            float hOffset, float vOffset, SkPaint* paint);

    virtual status_t drawPosText(const char* text, int bytesCount, int count,

            const float* positions, SkPaint* paint);

    virtual status_t drawText(const char* text, int bytesCount, int count, float x, float y,

            const float* positions, SkPaint* paint, float totalAdvance, const Rect& bounds,

            DrawOpMode drawOpMode);



    virtual status_t drawRects(const float* rects, int count, SkPaint* paint);



    virtual void resetShader();

    virtual void setupShader(SkiaShader* shader);



    virtual void resetColorFilter();

    virtual void setupColorFilter(SkiaColorFilter* filter);



    virtual void resetShadow();

    virtual void setupShadow(float radius, float dx, float dy, int color);

// ----------------------------------------------------------------------------

// Canvas draw operations - special

// ----------------------------------------------------------------------------

    virtual status_t drawLayer(Layer* layer, float x, float y);

    virtual status_t drawDisplayList(DisplayList* displayList, Rect& dirty,

            int32_t replayFlags);



    virtual void resetPaintFilter();

    virtual void setupPaintFilter(int clearBits, int setBits);

    // TODO: rename for consistency

    virtual status_t callDrawGLFunction(Functor* functor, Rect& dirty);



// ----------------------------------------------------------------------------

// DisplayList / resource management

// ----------------------------------------------------------------------------

    ANDROID_API void reset();



    sp<DisplayListData> getDisplayListData() const {

libs/hwui/FontRenderer.h

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ namespace RSC { 
}

#endif



class Functor;



namespace android {

namespace uirenderer {

libs/hwui/LayerRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void LayerRenderer::finish() { 
    // who will invoke OpenGLRenderer::resume()

}



GLint LayerRenderer::getTargetFbo() const {

GLuint LayerRenderer::getTargetFbo() const {

    return mLayer->getFbo();

}