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

Commit f0d6cbcd authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Apply display translation to blurred result" into rvc-dev am:... 

Merge "Apply display translation to blurred result" into rvc-dev am: 50f6c0e2 am: b7e08655 am: e1c8eced

Change-Id: I37c00a76442aca9f7431e4b2cd7747b01db3195b
parents 11cc098e e1c8eced

libs/renderengine/gl/filters/BlurFilter.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -68,6 +68,8 @@ BlurFilter::BlurFilter(GLESRenderEngine& engine) 
status_t BlurFilter::setAsDrawTarget(const DisplaySettings& display, uint32_t radius) {

status_t BlurFilter::setAsDrawTarget(const DisplaySettings& display, uint32_t radius) {

    ATRACE_NAME("BlurFilter::setAsDrawTarget");

    ATRACE_NAME("BlurFilter::setAsDrawTarget");

    mRadius = radius;

    mRadius = radius;

    mDisplayX = display.physicalDisplay.left;

    mDisplayY = display.physicalDisplay.top;





    if (mDisplayWidth < display.physicalDisplay.width() ||

    if (mDisplayWidth < display.physicalDisplay.width() ||

        mDisplayHeight < display.physicalDisplay.height()) {

        mDisplayHeight < display.physicalDisplay.height()) {
@@ -182,8 +184,8 @@ status_t BlurFilter::render(bool multiPass) { 
    if (mix >= 1 || multiPass) {

    if (mix >= 1 || multiPass) {

        mLastDrawTarget->bindAsReadBuffer();

        mLastDrawTarget->bindAsReadBuffer();

        glBlitFramebuffer(0, 0, mLastDrawTarget->getBufferWidth(),

        glBlitFramebuffer(0, 0, mLastDrawTarget->getBufferWidth(),

                          mLastDrawTarget->getBufferHeight(), 0, 0, mDisplayWidth, mDisplayHeight,

                          mLastDrawTarget->getBufferHeight(), mDisplayX, mDisplayY, mDisplayWidth,

                          GL_COLOR_BUFFER_BIT, GL_LINEAR);

                          mDisplayHeight, GL_COLOR_BUFFER_BIT, GL_LINEAR);

        return NO_ERROR;

        return NO_ERROR;

    }

    }

libs/renderengine/gl/filters/BlurFilter.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,8 @@ private: 
    GLFramebuffer mPongFbo;

    GLFramebuffer mPongFbo;

    uint32_t mDisplayWidth = 0;

    uint32_t mDisplayWidth = 0;

    uint32_t mDisplayHeight = 0;

    uint32_t mDisplayHeight = 0;

    uint32_t mDisplayX = 0;

    uint32_t mDisplayY = 0;

    // Buffer holding the final blur pass.

    // Buffer holding the final blur pass.

    GLFramebuffer* mLastDrawTarget;

    GLFramebuffer* mLastDrawTarget;