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

Commit f1c39b6e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GLConsumer: add HW_TEXTURE usage when create texture" am: 9c8c3be7... 

Merge "GLConsumer: add HW_TEXTURE usage when create texture" am: 9c8c3be7 am: 14c911b4 am: 5ebe49f0

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1842093

Change-Id: Ic0eefe4284f89ef1f5e57f0b4ecc169a4c74e2b9
parents 8c725e5d 5ebe49f0

libs/gui/GLConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ sp<GraphicBuffer> GLConsumer::getDebugTexImageBuffer() { 
        // continues to use it.

        sp<GraphicBuffer> buffer = new GraphicBuffer(

                kDebugData.width, kDebugData.height, PIXEL_FORMAT_RGBA_8888,

                GraphicBuffer::USAGE_SW_WRITE_RARELY,

                DEFAULT_USAGE_FLAGS | GraphicBuffer::USAGE_SW_WRITE_RARELY,

                "[GLConsumer debug texture]");

        uint32_t* bits;

        buffer->lock(GraphicBuffer::USAGE_SW_WRITE_RARELY, reinterpret_cast<void**>(&bits));

libs/nativedisplay/surfacetexture/EGLConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ sp<GraphicBuffer> EGLConsumer::getDebugTexImageBuffer() { 
        // continues to use it.

        sp<GraphicBuffer> buffer =

                new GraphicBuffer(kDebugData.width, kDebugData.height, PIXEL_FORMAT_RGBA_8888,

                                  GraphicBuffer::USAGE_SW_WRITE_RARELY,

                                  DEFAULT_USAGE_FLAGS | GraphicBuffer::USAGE_SW_WRITE_RARELY,

                                  "[EGLConsumer debug texture]");

        uint32_t* bits;

        buffer->lock(GraphicBuffer::USAGE_SW_WRITE_RARELY, reinterpret_cast<void**>(&bits));