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

Commit 3db42346 authored by Peiyong Lin's avatar Peiyong Lin
Browse files

[SurfaceFlinger] Remove unused clz.h 

The built-in method clz is no longer used anywhere in SurfaceFlinger, thus
remove this file and change all usage of min/max/swap to standard methods.

BUG: 112585051
Test: Build, flash
Change-Id: Ia5b47afae1ecbbda3c60d19de62ff9c76db743a4
parent 86b78a72

services/surfaceflinger/BufferLayer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "Colorizer.h"

#include "DisplayDevice.h"

#include "LayerRejecter.h"

#include "clz.h"



#include "RenderEngine/RenderEngine.h"

services/surfaceflinger/BufferQueueLayer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "BufferQueueLayer.h"

#include "LayerRejecter.h"

#include "clz.h"



#include <system/window.h>
@@ -449,7 +448,7 @@ void BufferQueueLayer::onFirstRef() { 


status_t BufferQueueLayer::setDefaultBufferProperties(uint32_t w, uint32_t h, PixelFormat format) {

    uint32_t const maxSurfaceDims =

            min(mFlinger->getMaxTextureSize(), mFlinger->getMaxViewportDims());

          std::min(mFlinger->getMaxTextureSize(), mFlinger->getMaxViewportDims());



    // never allow a surface larger than what our underlying GL implementation

    // can handle.

services/surfaceflinger/BufferStateLayer.cpp

+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#include "BufferStateLayer.h"

#include "RenderEngine/Image.h"

#include "clz.h"



#include <private/gui/SyncFeatures.h>
@@ -401,13 +400,13 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
    uint32_t bufferHeight = s.buffer->height;



    if (s.transform & Transform::ROT_90) {

        swap(bufferWidth, bufferHeight);

        std::swap(bufferWidth, bufferHeight);

    }



    if (s.transformToDisplayInverse) {

        uint32_t invTransform = DisplayDevice::getPrimaryDisplayOrientationTransform();

        if (invTransform & Transform::ROT_90) {

            swap(bufferWidth, bufferHeight);

            std::swap(bufferWidth, bufferHeight);

        }

    }

services/surfaceflinger/DisplayDevice.cpp

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include "DisplayHardware/HWC2.h"

#include "RenderEngine/RenderEngine.h"



#include "clz.h"

#include "DisplayDevice.h"

#include "SurfaceFlinger.h"

#include "Layer.h"
@@ -582,7 +581,7 @@ void DisplayDevice::setProjection(int orientation, 
        if (R.getOrientation() & Transform::ROT_90) {

            // viewport is always specified in the logical orientation

            // of the display (ie: post-rotation).

            swap(viewport.right, viewport.bottom);

            std::swap(viewport.right, viewport.bottom);

        }

    }

services/surfaceflinger/Layer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include "LayerRejecter.h"

#include "MonitoredProducer.h"

#include "SurfaceFlinger.h"

#include "clz.h"



#include "DisplayHardware/HWComposer.h"