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

Commit 1698297d authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Copy shaders" into lmp-dev

parents c931cc08 c1469f39

core/jni/android/graphics/Shader.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,7 @@ static void Shader_setLocalMatrix(JNIEnv* env, jobject o, jlong shaderHandle, jl 
        } else {

        } else {

            shader->resetLocalMatrix();

            shader->resetLocalMatrix();

        }

        }

        shader->setGenerationID(shader->getGenerationID() + 1);

    }

    }

}

}

libs/hwui/DisplayListRenderer.h

+17 −4
Original line number Original line Diff line number Diff line
@@ -215,11 +215,17 @@ private: 
        if (!paint) return NULL;

        if (!paint) return NULL;





        const SkPaint* paintCopy = mPaintMap.valueFor(paint);

        const SkPaint* paintCopy = mPaintMap.valueFor(paint);

        if (paintCopy == NULL || paintCopy->getGenerationID() != paint->getGenerationID()) {

        if (paintCopy == NULL

            paintCopy = new SkPaint(*paint);

                || paintCopy->getGenerationID() != paint->getGenerationID()

                // We can't compare shader pointers because that will always

                // change as we do partial copying via wrapping. However, if the

                // shader changes the paint generationID will have changed and

                // so we don't hit this comparison anyway

                || !(paint->getShader() && paintCopy->getShader()

                        && paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) {

            paintCopy = copyPaint(paint);

            // replaceValueFor() performs an add if the entry doesn't exist

            // replaceValueFor() performs an add if the entry doesn't exist

            mPaintMap.replaceValueFor(paint, paintCopy);

            mPaintMap.replaceValueFor(paint, paintCopy);

            mDisplayListData->paints.add(paintCopy);

        }

        }





        return paintCopy;

        return paintCopy;
@@ -228,8 +234,15 @@ private: 
    inline SkPaint* copyPaint(const SkPaint* paint) {

    inline SkPaint* copyPaint(const SkPaint* paint) {

        if (!paint) return NULL;

        if (!paint) return NULL;

        SkPaint* paintCopy = new SkPaint(*paint);

        SkPaint* paintCopy = new SkPaint(*paint);

        if (paint->getShader()) {

            SkShader* shaderCopy = SkShader::CreateLocalMatrixShader(

                    paint->getShader(), paint->getShader()->getLocalMatrix());

            paintCopy->setShader(shaderCopy);

            paintCopy->setGenerationID(paint->getGenerationID());

            shaderCopy->setGenerationID(paint->getShader()->getGenerationID());

            shaderCopy->unref();

        }

        mDisplayListData->paints.add(paintCopy);

        mDisplayListData->paints.add(paintCopy);



        return paintCopy;

        return paintCopy;

    }

    }