Merge "Remove VrFlinger usages from SF." (98fe2206) · Commits · e / os / android_frameworks_native

services/surfaceflinger/Android.bp

+0 −20

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,6 @@ cc_defaults {
	"-DEGL_EGLEXT_PROTOTYPES",		"-DEGL_EGLEXT_PROTOTYPES",
	],		],
	shared_libs: [		shared_libs: [
	"android.frameworks.vr.composer@2.0",
	"android.hardware.configstore-utils",		"android.hardware.configstore-utils",
	"android.hardware.configstore@1.0",		"android.hardware.configstore@1.0",
	"android.hardware.configstore@1.1",		"android.hardware.configstore@1.1",
	@@ -61,14 +60,6 @@ cc_defaults {
	"libutils",		"libutils",
	"libSurfaceFlingerProp",		"libSurfaceFlingerProp",
	],		],
	// VrComposer is not used when building surfaceflinger for vendors
	target: {
	vendor: {
	exclude_shared_libs: [
	"android.frameworks.vr.composer@2.0",
	],
	},
	},
	static_libs: [		static_libs: [
	"libcompositionengine",		"libcompositionengine",
	"libframetimeline",		"libframetimeline",
	@@ -76,7 +67,6 @@ cc_defaults {
	"librenderengine",		"librenderengine",
	"libserviceutils",		"libserviceutils",
	"libtrace_proto",		"libtrace_proto",
	"libvrflinger",
	],		],
	header_libs: [		header_libs: [
	"android.hardware.graphics.composer@2.1-command-buffer",		"android.hardware.graphics.composer@2.1-command-buffer",
	@@ -198,17 +188,7 @@ cc_defaults {
	],		],
	cflags: [		cflags: [
	"-DLOG_TAG=\"SurfaceFlinger\"",		"-DLOG_TAG=\"SurfaceFlinger\"",
	"-DUSE_VR_COMPOSER=1",
	],		],
	// VrComposer is not used when building surfaceflinger for vendors
	// TODO: Is this ever built for vendors?
	target: {
	vendor: {
	cflags: [
	"-DUSE_VR_COMPOSER=0",
	],
	},
	},
	shared_libs: [		shared_libs: [
	"android.frameworks.displayservice@1.0",		"android.frameworks.displayservice@1.0",
	"android.hardware.configstore-utils",		"android.hardware.configstore-utils",

services/surfaceflinger/CompositionEngine/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,6 @@ cc_defaults {
	"-DATRACE_TAG=ATRACE_TAG_GRAPHICS",		"-DATRACE_TAG=ATRACE_TAG_GRAPHICS",
	],		],
	shared_libs: [		shared_libs: [
	"android.frameworks.vr.composer@2.0",
	"android.hardware.graphics.allocator@2.0",		"android.hardware.graphics.allocator@2.0",
	"android.hardware.graphics.composer@2.1",		"android.hardware.graphics.composer@2.1",
	"android.hardware.graphics.composer@2.2",		"android.hardware.graphics.composer@2.2",

services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFECompositionState.h

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -130,16 +130,6 @@ struct LayerFECompositionState {
	Rect geomContentCrop;		Rect geomContentCrop;
	Rect geomCrop;		Rect geomCrop;

	/*
	* Extra metadata
	*/

	// The type for this layer
	int type{0};

	// The appId for this layer
	int appId{0};

	GenericLayerMetadataMap metadata;		GenericLayerMetadataMap metadata;

	/*		/*

services/surfaceflinger/CompositionEngine/src/LayerFECompositionState.cpp

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -75,10 +75,6 @@ void LayerFECompositionState::dump(std::string& out) const {
	dumpVal(out, "alpha", alpha);		dumpVal(out, "alpha", alpha);
	dumpVal(out, "backgroundBlurRadius", backgroundBlurRadius);		dumpVal(out, "backgroundBlurRadius", backgroundBlurRadius);

	out.append("\n ");
	dumpVal(out, "type", type);
	dumpVal(out, "appId", appId);

	if (!metadata.empty()) {		if (!metadata.empty()) {
	out.append("\n metadata {");		out.append("\n metadata {");
	for (const auto& [key, entry] : metadata) {		for (const auto& [key, entry] : metadata) {

services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -402,13 +402,6 @@ void OutputLayer::writeOutputIndependentGeometryStateToHWC(
	outputIndependentState.alpha, to_string(error).c_str(), static_cast<int32_t>(error));		outputIndependentState.alpha, to_string(error).c_str(), static_cast<int32_t>(error));
	}		}

	if (auto error = hwcLayer->setInfo(static_cast<uint32_t>(outputIndependentState.type),
	static_cast<uint32_t>(outputIndependentState.appId));
	error != hal::Error::NONE) {
	ALOGE("[%s] Failed to set info %s (%d)", getLayerFE().getDebugName(),
	to_string(error).c_str(), static_cast<int32_t>(error));
	}

	for (const auto& [name, entry] : outputIndependentState.metadata) {		for (const auto& [name, entry] : outputIndependentState.metadata) {
	if (auto error = hwcLayer->setLayerGenericMetadata(name, entry.mandatory, entry.value);		if (auto error = hwcLayer->setLayerGenericMetadata(name, entry.mandatory, entry.value);
	error != hal::Error::NONE) {		error != hal::Error::NONE) {