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

Commit cf8339b7 authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan Committed by Steve Kondik
Browse files

Bring back support for glReadPixels screenshot path 

Squashed commit of the following:

commit 012d3fe41d1d6cd38a0858b59145e9a4447641fa
Author: Hashcode <hashcode0f@gmail.com>
Date:   Sun Dec 8 19:36:50 2013 +0000

    sf: Always use opengles for screen capture

    Go back to the usage of GRALLOC_USAGE_HW_TEXTURE and GRALLOC_USAGE_HW_RENDERER
    in captureScreenImplLocked regardless of useReadPixels value

    This fixes the EGL_NO_IMAGE_KHR error returned from
    eglCreateImageKHR (blank images returned from screenshot path)

    Change-Id: I62fe90a081607b9e89c67f3dcfd34c84efc89d35

commit 4866ddf98ac98d8e22a1cd6a21894bb17f274588
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Thu Oct 31 03:53:39 2013 +0000

    Revert "remove support for glReadPixels screenshot path"

    This reverts commit 3ca76f41.

    Conflicts:
    	include/gui/ISurfaceComposer.h
    	libs/gui/ISurfaceComposer.cpp
    	libs/gui/SurfaceComposerClient.cpp
    	services/surfaceflinger/SurfaceFlinger.cpp
    	services/surfaceflinger/SurfaceFlinger.h

    Change-Id: I8c239e533757af770e418dbb198f5a86c736961f

Change-Id: I8c239e533757af770e418dbb198f5a86c736961f
parent 4b444cbc

include/gui/ISurfaceComposer.h

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ public: 
            Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,

            uint32_t minLayerZ, uint32_t maxLayerZ,

            bool useIdentityTransform,

            Rotation rotation = eRotateNone) = 0;

            Rotation rotation,

            bool isCpuConsumer) = 0;



    /* Clears the frame statistics for animations.

     *

libs/gui/ISurfaceComposer.cpp

+6 −2
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ public: 
            Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,

            uint32_t minLayerZ, uint32_t maxLayerZ,

            bool useIdentityTransform,

            ISurfaceComposer::Rotation rotation)

            ISurfaceComposer::Rotation rotation,

            bool isCpuConsumer)

    {

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
@@ -121,6 +122,7 @@ public: 
        data.writeInt32(maxLayerZ);

        data.writeInt32(static_cast<int32_t>(useIdentityTransform));

        data.writeInt32(static_cast<int32_t>(rotation));

        data.writeInt32(isCpuConsumer);

        remote()->transact(BnSurfaceComposer::CAPTURE_SCREEN, data, &reply);

        return reply.readInt32();

    }
@@ -359,11 +361,13 @@ status_t BnSurfaceComposer::onTransact( 
            uint32_t maxLayerZ = data.readInt32();

            bool useIdentityTransform = static_cast<bool>(data.readInt32());

            uint32_t rotation = data.readInt32();

            bool isCpuConsumer = data.readInt32();



            status_t res = captureScreen(display, producer,

                    sourceCrop, reqWidth, reqHeight, minLayerZ, maxLayerZ,

                    useIdentityTransform,

                    static_cast<ISurfaceComposer::Rotation>(rotation));

                    static_cast<ISurfaceComposer::Rotation>(rotation),

                    isCpuConsumer);

            reply->writeInt32(res);

            return NO_ERROR;

        }

libs/gui/SurfaceComposerClient.cpp

+3 −2
Original line number Diff line number Diff line
@@ -695,7 +695,8 @@ status_t ScreenshotClient::capture( 
    sp<ISurfaceComposer> s(ComposerService::getComposerService());

    if (s == NULL) return NO_INIT;

    return s->captureScreen(display, producer, sourceCrop,

            reqWidth, reqHeight, minLayerZ, maxLayerZ, useIdentityTransform);

            reqWidth, reqHeight, minLayerZ, maxLayerZ, useIdentityTransform,

            ISurfaceComposer::eRotateNone, false);

}



ScreenshotClient::ScreenshotClient()
@@ -733,7 +734,7 @@ status_t ScreenshotClient::update(const sp<IBinder>& display, 


    status_t err = s->captureScreen(display, mProducer, sourceCrop,

            reqWidth, reqHeight, minLayerZ, maxLayerZ, useIdentityTransform,

            static_cast<ISurfaceComposer::Rotation>(rotation));

            static_cast<ISurfaceComposer::Rotation>(rotation), true);



    if (err == NO_ERROR) {

        err = mCpuConsumer->lockNextBuffer(&mBuffer);

services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp

+30 −13
Original line number Diff line number Diff line
@@ -216,8 +216,10 @@ void GLES11RenderEngine::disableBlending() { 
}



void GLES11RenderEngine::bindImageAsFramebuffer(EGLImageKHR image,

        uint32_t* texName, uint32_t* fbName, uint32_t* status) {

        uint32_t* texName, uint32_t* fbName, uint32_t* status,

        bool useReadPixels, int reqWidth, int reqHeight) {

    GLuint tname, name;

    if (!useReadPixels) {

        // turn our EGLImage into a texture

        glGenTextures(1, &tname);

        glBindTexture(GL_TEXTURE_2D, tname);
@@ -228,16 +230,31 @@ void GLES11RenderEngine::bindImageAsFramebuffer(EGLImageKHR image, 
        glBindFramebufferOES(GL_FRAMEBUFFER_OES, name);

        glFramebufferTexture2DOES(GL_FRAMEBUFFER_OES,

                GL_COLOR_ATTACHMENT0_OES, GL_TEXTURE_2D, tname, 0);

    } else {

        // since we're going to use glReadPixels() anyways,

        // use an intermediate renderbuffer instead

        glGenRenderbuffersOES(1, &tname);

        glBindRenderbufferOES(GL_RENDERBUFFER_OES, tname);

        glRenderbufferStorageOES(GL_RENDERBUFFER_OES, GL_RGBA8_OES, reqWidth, reqHeight);

        // create a FBO to render into

        glGenFramebuffersOES(1, &name);

        glBindFramebufferOES(GL_FRAMEBUFFER_OES, name);

        glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, tname);

    }



    *status = glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES);

    *texName = tname;

    *fbName = name;

}



void GLES11RenderEngine::unbindFramebuffer(uint32_t texName, uint32_t fbName) {

void GLES11RenderEngine::unbindFramebuffer(uint32_t texName, uint32_t fbName,

        bool useReadPixels) {

    glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);

    glDeleteFramebuffersOES(1, &fbName);

    if (!useReadPixels)

        glDeleteTextures(1, &texName);

    else

        glDeleteRenderbuffersOES(1, &texName);

}



void GLES11RenderEngine::setupFillWithColor(float r, float g, float b, float a) {

services/surfaceflinger/RenderEngine/GLES11RenderEngine.h

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ class GLES11RenderEngine : public RenderEngine { 
    GLint mMaxTextureSize;



    virtual void bindImageAsFramebuffer(EGLImageKHR image,

            uint32_t* texName, uint32_t* fbName, uint32_t* status);

    virtual void unbindFramebuffer(uint32_t texName, uint32_t fbName);

            uint32_t* texName, uint32_t* fbName, uint32_t* status, bool useReadPixels, int reqWidth, int reqHeight);

    virtual void unbindFramebuffer(uint32_t texName, uint32_t fbName, bool useReadPixels);



public:

    GLES11RenderEngine();