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

Commit 8dc02f99 authored by John Reck's avatar John Reck
Browse files

Delete all ro.hwui.* props 

Remove all ro.hwui.* tuning props and instead
calculate them from the screen resolution.

Or just hardcode them to what all devices
were hardcoding them to anyway.

Bug: 63741221
Test: Check cache size results on sailfish

Change-Id: I8b0d210572a246f4fefb076935cf5156a70c274c
parent e3a9b8a3

libs/hwui/Caches.cpp

+5 −5
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ Caches* Caches::sInstance = nullptr; 
///////////////////////////////////////////////////////////////////////////////



Caches::Caches(RenderState& renderState)

        : gradientCache(mExtensions)

        : gradientCache(extensions())

        , patchCache(renderState)

        , programCache(mExtensions)

        , programCache(extensions())

        , mRenderState(&renderState)

        , mInitialized(false) {

    INIT_LOGD("Creating OpenGL renderer caches");
@@ -80,7 +80,7 @@ bool Caches::init() { 
}



void Caches::initExtensions() {

    if (mExtensions.hasDebugMarker()) {

    if (extensions().hasDebugMarker()) {

        eventMark = glInsertEventMarkerEXT;



        startMark = glPushGroupMarkerEXT;
@@ -93,12 +93,12 @@ void Caches::initExtensions() { 
}



void Caches::initConstraints() {

    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxTextureSize);

    maxTextureSize = DeviceInfo::get()->maxTextureSize();

}



void Caches::initStaticProperties() {

    // OpenGL ES 3.0+ specific features

    gpuPixelBuffersEnabled = mExtensions.hasPixelBufferObjects()

    gpuPixelBuffersEnabled = extensions().hasPixelBufferObjects()

            && property_get_bool(PROPERTY_ENABLE_GPU_PIXEL_BUFFERS, true);

}

libs/hwui/Caches.h

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


#pragma once



#include "DeviceInfo.h"

#include "Extensions.h"

#include "FboCache.h"

#include "GammaFontRenderer.h"
@@ -145,10 +146,6 @@ public: 
    // Misc

    GLint maxTextureSize;



private:

    // Declared before gradientCache and programCache which need this to initialize.

    // TODO: cleanup / move elsewhere

    Extensions mExtensions;

public:

    TextureCache textureCache;

    RenderBufferCache renderBufferCache;
@@ -174,7 +171,7 @@ public: 
    void setProgram(const ProgramDescription& description);

    void setProgram(Program* program);



    const Extensions& extensions() const { return mExtensions; }

    const Extensions& extensions() const { return DeviceInfo::get()->extensions(); }

    Program& program() { return *mProgram; }

    PixelBufferState& pixelBufferState() { return *mPixelBufferState; }

    TextureState& textureState() { return *mTextureState; }

libs/hwui/DeviceInfo.cpp

+11 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


#include <DeviceInfo.h>



#include "Extensions.h"

#include <gui/ISurfaceComposer.h>

#include <gui/SurfaceComposerClient.h>



#include <thread>

#include <mutex>
@@ -46,13 +47,22 @@ void DeviceInfo::initialize() { 
void DeviceInfo::initialize(int maxTextureSize) {

    std::call_once(sInitializedFlag, [maxTextureSize]() {

        sDeviceInfo = new DeviceInfo();

        sDeviceInfo->loadDisplayInfo();

        sDeviceInfo->mMaxTextureSize = maxTextureSize;

    });

}



void DeviceInfo::load() {

    loadDisplayInfo();

    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);

}



void DeviceInfo::loadDisplayInfo() {

    sp<IBinder> dtoken(SurfaceComposerClient::getBuiltInDisplay(

            ISurfaceComposer::eDisplayIdMain));

    status_t status = SurfaceComposerClient::getDisplayInfo(dtoken, &mDisplayInfo);

    LOG_ALWAYS_FATAL_IF(status, "Failed to get display info, error %d", status);

}



} /* namespace uirenderer */

} /* namespace android */

libs/hwui/DeviceInfo.h

+13 −0
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 
#ifndef DEVICEINFO_H

#define DEVICEINFO_H



#include <ui/DisplayInfo.h>



#include "utils/Macros.h"

#include "Extensions.h"



namespace android {

namespace uirenderer {
@@ -35,14 +38,24 @@ public: 
    static void initialize(int maxTextureSize);



    int maxTextureSize() const { return mMaxTextureSize; }

    const DisplayInfo& displayInfo() const { return mDisplayInfo; }

    const Extensions& extensions() const { return mExtensions; }



    static uint32_t multiplyByResolution(uint32_t in) {

        auto di = DeviceInfo::get()->displayInfo();

        return di.w * di.h * in;

    }



private:

    DeviceInfo() {}

    ~DeviceInfo() {}



    void load();

    void loadDisplayInfo();



    int mMaxTextureSize;

    DisplayInfo mDisplayInfo;

    Extensions mExtensions;

};



} /* namespace uirenderer */

libs/hwui/FboCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ namespace uirenderer { 
///////////////////////////////////////////////////////////////////////////////



FboCache::FboCache()

        : mMaxSize(Properties::fboCacheSize) {}

        : mMaxSize(0) {}



FboCache::~FboCache() {

    clear();