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

Commit 7a0f1e75 authored by Greg Kaiser's avatar Greg Kaiser Committed by Android (Google) Code Review
Browse files

Merge changes I79f91f42,Id498b2a8,I9d823feb 

* changes:
  surfaceflinger: Description init style change
  surfaceflinger: Initialize Description field
  surfaceflinger: Remove unused variable
parents ec814eea 25429cb7

services/surfaceflinger/DisplayHardware/HWC2.cpp

+0 −2
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ Error Display::supportsDoze(bool* outSupport) const 
Error Display::getHdrCapabilities(

        std::unique_ptr<HdrCapabilities>* outCapabilities) const

{

    uint32_t numTypes = 0;

    float maxLuminance = -1.0f;

    float maxAverageLuminance = -1.0f;

    float minLuminance = -1.0f;
@@ -480,7 +479,6 @@ Error Display::getHdrCapabilities( 
    for (auto type : intTypes) {

        types.push_back(static_cast<int32_t>(type));

    }

    numTypes = types.size();

    if (error != Error::None) {

        return error;

    }

services/surfaceflinger/RenderEngine/Description.cpp

+0 −9
Original line number Diff line number Diff line
@@ -26,15 +26,6 @@ 


namespace android {



Description::Description() {

    mPremultipliedAlpha = false;

    mOpaque = true;

    mTextureEnabled = false;

    mColorMatrixEnabled = false;

}



Description::~Description() {}



void Description::setPremultipliedAlpha(bool premultipliedAlpha) {

    mPremultipliedAlpha = premultipliedAlpha;

}

services/surfaceflinger/RenderEngine/Description.h

+7 −7
Original line number Diff line number Diff line
@@ -36,27 +36,27 @@ class Description { 
    friend class ProgramCache;



    // whether textures are premultiplied

    bool mPremultipliedAlpha;

    bool mPremultipliedAlpha = false;

    // whether this layer is marked as opaque

    bool mOpaque;

    bool mOpaque = true;



    // Texture this layer uses

    Texture mTexture;

    bool mTextureEnabled;

    bool mTextureEnabled = false;



    // color used when texturing is disabled or when setting alpha.

    half4 mColor;

    // projection matrix

    mat4 mProjectionMatrix;



    bool mColorMatrixEnabled;

    bool mColorMatrixEnabled = false;

    mat4 mColorMatrix;



    bool mIsWideGamut;

    bool mIsWideGamut = false;



public:

    Description();

    ~Description();

    Description() = default;

    ~Description() = default;



    void setPremultipliedAlpha(bool premultipliedAlpha);

    void setOpaque(bool opaque);