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

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

Merge "include system ANGLE usage as ANGLE usage" into main

parents d5a57a5d b794d9bb

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,

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

    };



    enum Stats {

opengl/libs/EGL/Loader.cpp

+8 −1
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ 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;
@@ -635,7 +636,13 @@ 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 (suffix && 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

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

        appInfo.appPackageName = appPackageName;

        appInfo.driverVersionCode = driverVersionCode;

        appInfo.angleInUse = driverPackageName == "angle";

        appInfo.angleInUse =

                driver == GpuStatsInfo::Driver::ANGLE || driverPackageName == "angle";

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

        mAppStats.insert({appStatsKey, appInfo});

    } else {

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

        mAppStats[appStatsKey].angleInUse =

                driver == GpuStatsInfo::Driver::ANGLE || driverPackageName == "angle";

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

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

    }