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

Commit 79ffca2f authored by Solti Ho's avatar Solti Ho Committed by Android (Google) Code Review
Browse files

Revert "include system ANGLE usage as ANGLE usage" 

This reverts commit b5260907.

Reason for revert: b/308152854

Change-Id: I0a403febbd2561d19a100f36ce2401989d936ad5
parent b5260907

libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public: 
        GL_UPDATED = 2,

        VULKAN = 3,

        VULKAN_UPDATED = 4,

        ANGLE = 5, // cover both system ANGLE and ANGLE APK

        ANGLE = 5,

    };



    enum Stats {

opengl/libs/EGL/Loader.cpp

+1 −8
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ Loader::driver_t* Loader::attempt_to_load_angle(egl_connection_t* cnx) { 
        return nullptr;

    }



    // use ANGLE APK driver

    android::GraphicsEnv::getInstance().setDriverToLoad(android::GpuStatsInfo::Driver::ANGLE);

    driver_t* hnd = nullptr;
@@ -636,13 +635,7 @@ Loader::driver_t* Loader::attempt_to_load_updated_driver(egl_connection_t* cnx) 
Loader::driver_t* Loader::attempt_to_load_system_driver(egl_connection_t* cnx, const char* suffix,

                                                        const bool exact) {

    ATRACE_CALL();

    if (strcmp(suffix, "angle") == 0) {

        // use system ANGLE driver

        android::GraphicsEnv::getInstance().setDriverToLoad(android::GpuStatsInfo::Driver::ANGLE);

    } else {

    android::GraphicsEnv::getInstance().setDriverToLoad(android::GpuStatsInfo::Driver::GL);

    }



    driver_t* hnd = nullptr;

    void* dso = load_system_driver("GLES", suffix, exact);

    if (dso) {

services/gpuservice/gpustats/GpuStats.cpp

+2 −2
Original line number Diff line number Diff line
@@ -163,11 +163,11 @@ void GpuStats::insertDriverStats(const std::string& driverPackageName, 
        addLoadingTime(driver, driverLoadingTime, &appInfo);

        appInfo.appPackageName = appPackageName;

        appInfo.driverVersionCode = driverVersionCode;

        appInfo.angleInUse = driver == GpuStatsInfo::Driver::ANGLE;

        appInfo.angleInUse = driverPackageName == "angle";

        appInfo.lastAccessTime = std::chrono::system_clock::now();

        mAppStats.insert({appStatsKey, appInfo});

    } else {

        mAppStats[appStatsKey].angleInUse = driver == GpuStatsInfo::Driver::ANGLE;

        mAppStats[appStatsKey].angleInUse = driverPackageName == "angle";

        addLoadingTime(driver, driverLoadingTime, &mAppStats[appStatsKey]);

        mAppStats[appStatsKey].lastAccessTime = std::chrono::system_clock::now();

    }