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

Commit 193a8c93 authored by Steve Kondik's avatar Steve Kondik
Browse files

surfaceflinger: Isolate S3D code to msm8996 only 

Change-Id: Ie4b77b55eb306c795b452c59d8ae3383bd2804bc
parent 534f8574

services/surfaceflinger/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ ifeq ($(TARGET_USES_QCOM_BSP), true) 
    LOCAL_SHARED_LIBRARIES += libqdutils

    LOCAL_SHARED_LIBRARIES += libqdMetaData

    LOCAL_CFLAGS += -DQTI_BSP

    ifeq ($(call is-board-platform-in-list,msm8996),true)

        LOCAL_CFLAGS += -DSDM_TARGET

    endif

    LOCAL_SRC_FILES += \

        ExSurfaceFlinger/ExLayer.cpp \

        ExSurfaceFlinger/ExSurfaceFlinger.cpp \

services/surfaceflinger/ExSurfaceFlinger/ExHWComposer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ bool ExHWComposer::isCompositionTypeBlit(const int32_t compType) const { 
    return false;

}



#ifdef QTI_BSP

#if defined(QTI_BSP) && defined(SDM_TARGET)

uint32_t ExHWComposer::getS3DFlag(int disp) const {

    const DisplayData& disp_data(mDisplayData[disp]);

services/surfaceflinger/ExSurfaceFlinger/ExLayer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ bool ExLayer::canAllowGPUForProtected() const { 
void ExLayer::drawWithOpenGL(const sp<const DisplayDevice>& hw,

        const Region& /* clip */, bool useIdentityTransform) const {

    const State& s(getDrawingState());

#ifdef QTI_BSP

#if defined(QTI_BSP) && defined(SDM_TARGET)

    uint32_t s3d_fmt = 0;

    private_handle_t *pvt_handle = static_cast<private_handle_t *>

                                    (const_cast<native_handle_t*>(mActiveBuffer->handle));
@@ -278,14 +278,14 @@ void ExLayer::drawWithOpenGL(const sp<const DisplayDevice>& hw, 
    texCoords[2] = vec2(right, 1.0f - bottom);

    texCoords[3] = vec2(right, 1.0f - top);



#ifdef QTI_BSP

#if defined(QTI_BSP) && defined(SDM_TARGET)

    computeGeometryS3D(hw, mMesh, mMeshLeftTop, mMeshRightBottom, s3d_fmt);

#endif



    RenderEngine& engine(mFlinger->getRenderEngine());

    engine.setupLayerBlending(mPremultipliedAlpha, isOpaque(s), s.alpha);



#ifdef QTI_BSP

#if defined(QTI_BSP) && defined(SDM_TARGET)

    if (s3d_fmt != HWC_S3DMODE_NONE) {

        engine.setScissor(0, 0, hw->getWidth(), hw->getHeight());

        engine.drawMesh(mMeshLeftTop);
@@ -293,7 +293,7 @@ void ExLayer::drawWithOpenGL(const sp<const DisplayDevice>& hw, 
    } else {

#endif

        engine.drawMesh(mMesh);

#ifdef QTI_BSP

#if defined(QTI_BSP) && defined(SDM_TARGET)

    }

#endif

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,7 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const 
        }



        // Never touch the framebuffer if we don't have any framebuffer layers

#ifdef QTI_BSP

#if defined(QTI_BSP) && defined(SDM_TARGET)

        const bool hasHwcComposition = hwc.hasHwcComposition(id) |

            (reinterpret_cast<ExHWComposer*>(&hwc))->getS3DFlag(id);

#else