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

Commit bd2d97f2 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am 9de2a8f4: Merge "Add AA flag to TessellationCache key" into lmp-preview-dev 

* commit '9de2a8f42d88e50146947a7bf21b212ea134ee83':
  Add AA flag to TessellationCache key
parents 4cf5fc2e 0c447bf3

libs/hwui/TessellationCache.cpp

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ namespace uirenderer { 


TessellationCache::Description::Description()

        : type(kNone)

        , aa(false)

        , cap(SkPaint::kDefault_Cap)

        , style(SkPaint::kFill_Style)

        , strokeWidth(1.0f) {
@@ -47,6 +48,7 @@ TessellationCache::Description::Description() 


TessellationCache::Description::Description(Type type)

        : type(type)

        , aa(false)

        , cap(SkPaint::kDefault_Cap)

        , style(SkPaint::kFill_Style)

        , strokeWidth(1.0f) {
@@ -55,6 +57,7 @@ TessellationCache::Description::Description(Type type) 


TessellationCache::Description::Description(Type type, const SkPaint* paint)

        : type(type)

        , aa(paint->isAntiAlias())

        , cap(paint->getStrokeCap())

        , style(paint->getStyle())

        , strokeWidth(paint->getStrokeWidth()) {
@@ -63,6 +66,7 @@ TessellationCache::Description::Description(Type type, const SkPaint* paint) 


hash_t TessellationCache::Description::hash() const {

    uint32_t hash = JenkinsHashMix(0, type);

    hash = JenkinsHashMix(hash, aa);

    hash = JenkinsHashMix(hash, cap);

    hash = JenkinsHashMix(hash, style);

    hash = JenkinsHashMix(hash, android::hash_type(strokeWidth));

libs/hwui/TessellationCache.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ public: 
        };



        Type type;

        bool aa;

        SkPaint::Cap cap;

        SkPaint::Style style;

        float strokeWidth;