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

Commit 2ece4cdc authored by Jamie Gennis's avatar Jamie Gennis
Browse files

Reset ANativeWindow crop on buffer geometry changes. 

This changes the ANativeWindow API and the two implementations to reset
the window's crop rectangle to be uncropped when the window's buffer
geometry is changed.

Bug: 3359604
Change-Id: I64283dc8382ae687787ec0bebe6a5d5b4a0dcd6b
parent 0982dc64

include/ui/egl/android_natives.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -315,6 +315,8 @@ static inline int native_window_set_buffer_count( 
 * If all parameters are 0, the normal behavior is restored. That is,

 * If all parameters are 0, the normal behavior is restored. That is,

 * dequeued buffers following this call will be sized to the window's size.

 * dequeued buffers following this call will be sized to the window's size.

 *

 *

 * Calling this function will reset the window crop to a NULL value, which

 * disables cropping of the buffers.

 */

 */

static inline int native_window_set_buffers_geometry(

static inline int native_window_set_buffers_geometry(

        ANativeWindow* window,

        ANativeWindow* window,

libs/gui/SurfaceTextureClient.cpp

+11 −6
Original line number Original line Diff line number Diff line
@@ -238,13 +238,15 @@ int SurfaceTextureClient::setCrop(Rect const* rect) 
    LOGV("SurfaceTextureClient::setCrop");

    LOGV("SurfaceTextureClient::setCrop");

    Mutex::Autolock lock(mMutex);

    Mutex::Autolock lock(mMutex);





    // empty/invalid rects are not allowed

    Rect realRect;

    if (rect->isEmpty())

    if (rect == NULL || rect->isEmpty()) {

        return BAD_VALUE;

        realRect = Rect(0, 0);

    } else {

        realRect = *rect;

    }





    status_t err = mSurfaceTexture->setCrop(*rect);

    status_t err = mSurfaceTexture->setCrop(*rect);

    LOGE_IF(err, "ISurfaceTexture::setCrop(...) returned %s",

    LOGE_IF(err, "ISurfaceTexture::setCrop(...) returned %s", strerror(-err));

            strerror(-err));





    return err;

    return err;

}

}
@@ -280,7 +282,10 @@ int SurfaceTextureClient::setBuffersGeometry(int w, int h, int format) 
    mReqHeight = h;

    mReqHeight = h;

    mReqFormat = format;

    mReqFormat = format;





    return NO_ERROR;

    status_t err = mSurfaceTexture->setCrop(Rect(0, 0));

    LOGE_IF(err, "ISurfaceTexture::setCrop(...) returned %s", strerror(-err));



    return err;

}

}





int SurfaceTextureClient::setBuffersTransform(int transform)

int SurfaceTextureClient::setBuffersTransform(int transform)

libs/surfaceflinger_client/Surface.cpp

+10 −5
Original line number Original line Diff line number Diff line
@@ -827,13 +827,15 @@ int Surface::disconnect(int api) 




int Surface::crop(Rect const* rect)

int Surface::crop(Rect const* rect)

{

{

    // empty/invalid rects are not allowed

    if (rect->isEmpty())

        return BAD_VALUE;



    Mutex::Autolock _l(mSurfaceLock);

    Mutex::Autolock _l(mSurfaceLock);

    // TODO: validate rect size

    // TODO: validate rect size



    if (rect == NULL || rect->isEmpty()) {

        mNextBufferCrop = Rect(0,0);

    } else {

        mNextBufferCrop = *rect;

        mNextBufferCrop = *rect;

    }



    return NO_ERROR;

    return NO_ERROR;

}

}
@@ -884,6 +886,9 @@ int Surface::setBuffersGeometry(int w, int h, int format) 
        // EGLConfig validation.

        // EGLConfig validation.

        mFormat = format;

        mFormat = format;

    }

    }



    mNextBufferCrop = Rect(0,0);



    return NO_ERROR;

    return NO_ERROR;

}

}

services/surfaceflinger/LayerBase.cpp

+3 −5
Original line number Original line Diff line number Diff line
@@ -498,13 +498,11 @@ void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const 
}

}





void LayerBase::setBufferCrop(const Rect& crop) {

void LayerBase::setBufferCrop(const Rect& crop) {

    if (!crop.isEmpty()) {

    if (mBufferCrop != crop) {

    if (mBufferCrop != crop) {

        mBufferCrop = crop;

        mBufferCrop = crop;

        mFlinger->invalidateHwcGeometry();

        mFlinger->invalidateHwcGeometry();

    }

    }

}

}

}





void LayerBase::setBufferTransform(uint32_t transform) {

void LayerBase::setBufferTransform(uint32_t transform) {

    if (mBufferTransform != transform) {

    if (mBufferTransform != transform) {