Commit 371af857 authored Aug 22, 2024 by Solti

Deprecate glDriverFallback logging

Based on the discussion in
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/native/+/28925365/comment/148a6605_aa13457e/
"glDriverFallback" is no longer needed. Hence the CL removes it.

previously it's okay to fallback so the logging was recording the cases when an intent to load GL_UPDATED or ANGLE is somehow overwritten, ex) loading failure and fallback to something else.

The current behavior now is to fail loudly if loading ANGLE or GL_UPDATED fails, no more fallback. Therefore, no need to log the fallback cases.

Test: $abtd test --test_location=remote --tag=test_loading_metric_fix --reference_build_id=12276316 --v2_test_name=angle_CtsAngleIntegrationHostTestCases_git_main th:cl:28948939:husky-trunk_staging-userdebug:git_main "$PROD_CONFIG", [result](https://android-build.corp.google.com/builds/abtd/run/L34800030006075559)
Test: $abtd test --test_location=remote --tag=test_loading_metric_fix --reference_build_id=12276316 --v2_test_name=angle_CtsAngleIntegrationHostTestCases_git_main_gles th:cl:28948939:husky_angle-next-userdebug:git_main "$PROD_CONFIG", [result](https://android-build.corp.google.com/builds/abtd/run/L88800030006075562)
Test: $abtd test --test_location=remote --tag=test_loading_metric_fix --reference_build_id=12276316 --v2_test_name=angle_CtsAngleIntegrationHostTestCases_git_main_gles th:cl:28948939:husky-next-userdebug:git_main "$PROD_CONFIG", [result](https://android-build.corp.google.com/builds/abtd/run/L48800030006011636)

Flag: EXEMPT bugfix
Test: default presubmit
Bug: b/359337792
Change-Id: If35ec31c2b34d3cd1c4bc8681f00404961a5eeed

parent 2f16d7e7

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;