From d290c36e6e30a2be150605cf8437d36e095e1ab7 Mon Sep 17 00:00:00 2001 From: Alec Mouri Date: Tue, 23 May 2023 17:25:19 +0000 Subject: Revert "Turn on vk unit tests" This reverts commit aa3e498bbc9825b8c07a2094dc83e15b6bb47ffc. Reason for revert: Synchronization with WebView is hard. Also: * All currently shipping devices that turn Vulkan on for HWUI support at least two graphics queues, with the exception of emulators using swiftshader. * Using two graphics queues doesn't significantly regress RAM on those devices Bug: 280564832 Test: DailyMail app (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:219997a1e7c07a70aa935f09dbff9fb53ed03cb7) Merged-In: Ica0c461af9df771292967ed10df63b2aa6902ae3 Change-Id: Ica0c461af9df771292967ed10df63b2aa6902ae3 --- libs/hwui/Properties.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'libs/hwui/Properties.cpp') diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index 7af6efb7da41..06aed63d8def 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -17,7 +17,6 @@ #include "Properties.h" #include "Debug.h" -#include "log/log_main.h" #ifdef __ANDROID__ #include "HWUIProperties.sysprop.h" #endif @@ -220,12 +219,15 @@ RenderPipelineType Properties::getRenderPipelineType() { return sRenderPipelineType; } -void Properties::overrideRenderPipelineType(RenderPipelineType type, bool inUnitTest) { +void Properties::overrideRenderPipelineType(RenderPipelineType type) { // If we're doing actual rendering then we can't change the renderer after it's been set. - // Unit tests can freely change this as often as it wants. - LOG_ALWAYS_FATAL_IF(sRenderPipelineType != RenderPipelineType::NotInitialized && - sRenderPipelineType != type && !inUnitTest, - "Trying to change pipeline but it's already set."); + // Unit tests can freely change this as often as it wants, though, as there's no actual + // GL rendering happening + if (sRenderPipelineType != RenderPipelineType::NotInitialized) { + LOG_ALWAYS_FATAL_IF(sRenderPipelineType != type, + "Trying to change pipeline but it's already set"); + return; + } sRenderPipelineType = type; } -- cgit v1.2.3-59-g8ed1b