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

Commit c49d9961 authored by Daniel Hillenbrand's avatar Daniel Hillenbrand Committed by Gerrit Code Review
Browse files

Merge "exynos4: ui: define USAGE_HW_FIMC1 to support gralloc" into mr1-staging

parents 7db063a5 1e5774b1

include/ui/GraphicBuffer.h

+4 −1
Original line number Diff line number Diff line
@@ -64,7 +64,10 @@ public: 
        USAGE_HW_2D             = GRALLOC_USAGE_HW_2D,

        USAGE_HW_COMPOSER       = GRALLOC_USAGE_HW_COMPOSER,

        USAGE_HW_VIDEO_ENCODER  = GRALLOC_USAGE_HW_VIDEO_ENCODER,

        USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK

        USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK,

#ifdef EXYNOS4_ENHANCEMENTS

        USAGE_HW_FIMC1          = GRALLOC_USAGE_HW_FIMC1

#endif

    };



    GraphicBuffer();

include/ui/GraphicBufferAllocator.h

+4 −1
Original line number Diff line number Diff line
@@ -56,7 +56,10 @@ public: 
        USAGE_HW_TEXTURE        = GRALLOC_USAGE_HW_TEXTURE,

        USAGE_HW_RENDER         = GRALLOC_USAGE_HW_RENDER,

        USAGE_HW_2D             = GRALLOC_USAGE_HW_2D,

        USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK

        USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK,

#ifdef EXYNOS4_ENHANCEMENTS

        USAGE_HW_FIMC1          = GRALLOC_USAGE_HW_FIMC1

#endif

    };



    static inline GraphicBufferAllocator& get() { return getInstance(); }