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

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

Merge "Deprecate glDriverFallback logging" into main

parents 099e6383 371af857

libs/graphicsenv/GraphicsEnv.cpp

+4 −13
Original line number Diff line number Diff line
@@ -401,18 +401,10 @@ void GraphicsEnv::setDriverToLoad(GpuStatsInfo::Driver driver) { 
    switch (driver) {

        case GpuStatsInfo::Driver::GL:

        case GpuStatsInfo::Driver::GL_UPDATED:

        case GpuStatsInfo::Driver::ANGLE: {

            if (mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::NONE ||

                mGpuStats.glDriverToLoad == GpuStatsInfo::Driver::GL) {

        case GpuStatsInfo::Driver::ANGLE:

            mGpuStats.glDriverToLoad = driver;

            break;

            }



            if (mGpuStats.glDriverFallback == GpuStatsInfo::Driver::NONE) {

                mGpuStats.glDriverFallback = driver;

            }

            break;

        }

        case GpuStatsInfo::Driver::VULKAN:

        case GpuStatsInfo::Driver::VULKAN_UPDATED: {

            if (mGpuStats.vkDriverToLoad == GpuStatsInfo::Driver::NONE ||
@@ -561,8 +553,7 @@ void GraphicsEnv::sendGpuStatsLocked(GpuStatsInfo::Api api, bool isDriverLoaded, 
    bool isIntendedDriverLoaded = false;

    if (api == GpuStatsInfo::Api::API_GL) {

        driver = mGpuStats.glDriverToLoad;

        isIntendedDriverLoaded =

                isDriverLoaded && (mGpuStats.glDriverFallback == GpuStatsInfo::Driver::NONE);

        isIntendedDriverLoaded = isDriverLoaded;

    } else {

        driver = mGpuStats.vkDriverToLoad;

        isIntendedDriverLoaded =

libs/graphicsenv/include/graphicsenv/GpuStatsInfo.h

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ public: 
    std::string appPackageName = "";

    int32_t vulkanVersion = 0;

    Driver glDriverToLoad = Driver::NONE;

    Driver glDriverFallback = Driver::NONE;

    Driver vkDriverToLoad = Driver::NONE;

    Driver vkDriverFallback = Driver::NONE;

    bool glDriverToSend = false;