Merge "Remove unused HWUI properties." (85c34682) · Commits · e / os / android_frameworks_base

libs/hwui/Properties.cpp

+1 −26

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@
		namespace android {
		namespace uirenderer {

		bool Properties::drawDeferDisabled = false;
		bool Properties::drawReorderDisabled = false;
		bool Properties::debugLayersUpdates = false;
		bool Properties::debugOverdraw = false;
		bool Properties::showDirtyRegions = false;
		@@ -40,7 +38,6 @@ bool Properties::enablePartialUpdates = true;

		DebugLevel Properties::debugLevel = kDebugDisabled;
		OverdrawColorSet Properties::overdrawColorSet = OverdrawColorSet::Default;
		StencilClipDebug Properties::debugStencilClip = StencilClipDebug::Hide;

		float Properties::overrideLightRadius = -1.0f;
		float Properties::overrideLightPosY = -1.0f;
		@@ -85,7 +82,6 @@ bool Properties::load() {
		char property[PROPERTY_VALUE_MAX];
		bool prevDebugLayersUpdates = debugLayersUpdates;
		bool prevDebugOverdraw = debugOverdraw;
		StencilClipDebug prevDebugStencilClip = debugStencilClip;

		debugOverdraw = false;
		if (property_get(PROPERTY_DEBUG_OVERDRAW, property, nullptr) > 0) {
		@@ -99,20 +95,6 @@ bool Properties::load() {
		}
		}

		// See Properties.h for valid values
		if (property_get(PROPERTY_DEBUG_STENCIL_CLIP, property, nullptr) > 0) {
		INIT_LOGD(" Stencil clip debug enabled: %s", property);
		if (!strcmp(property, "hide")) {
		debugStencilClip = StencilClipDebug::Hide;
		} else if (!strcmp(property, "highlight")) {
		debugStencilClip = StencilClipDebug::ShowHighlight;
		} else if (!strcmp(property, "region")) {
		debugStencilClip = StencilClipDebug::ShowRegion;
		}
		} else {
		debugStencilClip = StencilClipDebug::Hide;
		}

		sProfileType = ProfileType::None;
		if (property_get(PROPERTY_PROFILE, property, "") > 0) {
		if (!strcmp(property, PROPERTY_PROFILE_VISUALIZE_BARS)) {
		@@ -125,12 +107,6 @@ bool Properties::load() {
		debugLayersUpdates = property_get_bool(PROPERTY_DEBUG_LAYERS_UPDATES, false);
		INIT_LOGD(" Layers updates debug enabled: %d", debugLayersUpdates);

		drawDeferDisabled = property_get_bool(PROPERTY_DISABLE_DRAW_DEFER, false);
		INIT_LOGD(" Draw defer %s", drawDeferDisabled ? "disabled" : "enabled");

		drawReorderDisabled = property_get_bool(PROPERTY_DISABLE_DRAW_REORDER, false);
		INIT_LOGD(" Draw reorder %s", drawReorderDisabled ? "disabled" : "enabled");

		showDirtyRegions = property_get_bool(PROPERTY_DEBUG_SHOW_DIRTY_REGIONS, false);

		debugLevel = (DebugLevel)property_get_int(PROPERTY_DEBUG, kDebugDisabled);
		@@ -152,8 +128,7 @@ bool Properties::load() {

		enableForceDarkSupport = property_get_bool(PROPERTY_ENABLE_FORCE_DARK, true);

		return (prevDebugLayersUpdates != debugLayersUpdates) \|\| (prevDebugOverdraw != debugOverdraw) \|\|
		(prevDebugStencilClip != debugStencilClip);
		return (prevDebugLayersUpdates != debugLayersUpdates) \|\| (prevDebugOverdraw != debugOverdraw);
		}

		void Properties::overrideProperty(const char* name, const char* value) {

libs/hwui/Properties.h

+0 −32

Original line number	Diff line number	Diff line
		@@ -94,20 +94,6 @@ enum DebugLevel {
		#define PROPERTY_PROFILE "debug.hwui.profile"
		#define PROPERTY_PROFILE_VISUALIZE_BARS "visual_bars"

		/**
		* Used to enable/disable non-rectangular clipping debugging.
		*
		* The accepted values are:
		* "highlight", drawing commands clipped by the stencil will
		* be colored differently
		* "region", renders the clipping region on screen whenever
		* the stencil is set
		* "hide", don't show the clip
		*
		* The default value is "hide".
		*/
		#define PROPERTY_DEBUG_STENCIL_CLIP "debug.hwui.show_non_rect_clip"

		/**
		* Turn on to draw dirty regions every other frame.
		*
		@@ -117,19 +103,6 @@ enum DebugLevel {
		*/
		#define PROPERTY_DEBUG_SHOW_DIRTY_REGIONS "debug.hwui.show_dirty_regions"

		/**
		* Disables draw operation deferral if set to "true", forcing draw
		* commands to be issued to OpenGL in order, and processed in sequence
		* with state-manipulation canvas commands.
		*/
		#define PROPERTY_DISABLE_DRAW_DEFER "debug.hwui.disable_draw_defer"

		/**
		* Used to disable draw operation reordering when deferring draw operations
		* Has no effect if PROPERTY_DISABLE_DRAW_DEFER is set to "true"
		*/
		#define PROPERTY_DISABLE_DRAW_REORDER "debug.hwui.disable_draw_reorder"

		/**
		* Setting this property will enable or disable the dropping of frames with
		* empty damage. Default is "true".
		@@ -207,8 +180,6 @@ enum class ProfileType { None, Console, Bars };

		enum class OverdrawColorSet { Default = 0, Deuteranomaly };

		enum class StencilClipDebug { Hide, ShowHighlight, ShowRegion };

		enum class RenderPipelineType { SkiaGL, SkiaVulkan, NotInitialized = 128 };

		/**
		@@ -220,8 +191,6 @@ class Properties {
		public:
		static bool load();

		static bool drawDeferDisabled;
		static bool drawReorderDisabled;
		static bool debugLayersUpdates;
		static bool debugOverdraw;
		static bool showDirtyRegions;
		@@ -235,7 +204,6 @@ public:

		static DebugLevel debugLevel;
		static OverdrawColorSet overdrawColorSet;
		static StencilClipDebug debugStencilClip;

		// Override the value for a subset of properties in this class
		static void overrideProperty(const char* name, const char* value);