Merge "Change to using sysprop for libEGL and EGL_test" into rvc-dev (ef960f8a) · Commits · e / os / android_frameworks_native

opengl/libs/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -154,6 +154,7 @@ cc_library_shared {
	"libnativebridge_lazy",		"libnativebridge_lazy",
	"libnativeloader_lazy",		"libnativeloader_lazy",
	"libutils",		"libutils",
			"libSurfaceFlingerProp",
	],		],
	static_libs: [		static_libs: [
	"libEGL_getProcAddress",		"libEGL_getProcAddress",
	@@ -165,6 +166,7 @@ cc_library_shared {
	symbol_file: "libEGL.map.txt",		symbol_file: "libEGL.map.txt",
	versions: ["29"],		versions: ["29"],
	},		},
			header_libs: ["libsurfaceflinger_headers"],
	}		}

	cc_test {		cc_test {

opengl/libs/EGL/egl_display.cpp

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@
	#include "egl_object.h"		#include "egl_object.h"
	#include "egl_tls.h"		#include "egl_tls.h"

			#include <SurfaceFlingerProperties.h>
	#include <android/dlext.h>		#include <android/dlext.h>
	#include <dlfcn.h>		#include <dlfcn.h>
	#include <graphicsenv/GraphicsEnv.h>		#include <graphicsenv/GraphicsEnv.h>
	@@ -361,9 +362,7 @@ EGLBoolean egl_display_t::initialize(EGLint major, EGLint minor) {

	// Note: CDD requires that devices supporting wide color and/or HDR color also support		// Note: CDD requires that devices supporting wide color and/or HDR color also support
	// the EGL_KHR_gl_colorspace extension.		// the EGL_KHR_gl_colorspace extension.
	bool wideColorBoardConfig =		bool wideColorBoardConfig = android::sysprop::has_wide_color_display(false);
	getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasWideColorDisplay>(
	false);

	// Add wide-color extensions if device can support wide-color		// Add wide-color extensions if device can support wide-color
	if (wideColorBoardConfig && hasColorSpaceSupport) {		if (wideColorBoardConfig && hasColorSpaceSupport) {
	@@ -373,8 +372,7 @@ EGLBoolean egl_display_t::initialize(EGLint major, EGLint minor) {
	"EGL_EXT_gl_colorspace_display_p3_passthrough ");		"EGL_EXT_gl_colorspace_display_p3_passthrough ");
	}		}

	bool hasHdrBoardConfig =		bool hasHdrBoardConfig = android::sysprop::has_HDR_display(false);
	getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasHDRDisplay>(false);

	if (hasHdrBoardConfig && hasColorSpaceSupport) {		if (hasHdrBoardConfig && hasColorSpaceSupport) {
	// hasHDRBoardConfig indicates the system is capable of supporting HDR content.		// hasHDRBoardConfig indicates the system is capable of supporting HDR content.

opengl/tests/EGLTest/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ cc_test {
	"liblog",		"liblog",
	"libutils",		"libutils",
	"libnativewindow",		"libnativewindow",
			"libSurfaceFlingerProp",
	],		],

	include_dirs: [		include_dirs: [
	@@ -34,5 +35,6 @@ cc_test {

	header_libs: [		header_libs: [
	"bionic_libc_platform_headers",		"bionic_libc_platform_headers",
			"libsurfaceflinger_headers",
	],		],
	}		}

opengl/tests/EGLTest/EGL_test.cpp

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	#include <gtest/gtest.h>		#include <gtest/gtest.h>

			#include <SurfaceFlingerProperties.h>
	#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>		#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

	#include <configstore/Utils.h>		#include <configstore/Utils.h>
	@@ -52,11 +53,9 @@ using namespace android::hardware::configstore::V1_0;

	#define METADATA_SCALE(x) (static_cast<EGLint>(x * EGL_METADATA_SCALING_EXT))		#define METADATA_SCALE(x) (static_cast<EGLint>(x * EGL_METADATA_SCALING_EXT))

	static bool hasWideColorDisplay =		static bool hasWideColorDisplay = android::sysprop::has_wide_color_display(false);
	getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasWideColorDisplay>(false);

	static bool hasHdrDisplay =		static bool hasHdrDisplay = android::sysprop::has_HDR_display(false);
	getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasHDRDisplay>(false);

	class EGLTest : public ::testing::Test {		class EGLTest : public ::testing::Test {
	public:		public:

services/surfaceflinger/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -286,6 +286,7 @@ cc_library_shared {
	export_shared_lib_headers: [		export_shared_lib_headers: [
	"android.hardware.graphics.common@1.2",		"android.hardware.graphics.common@1.2",
	"libhidlbase",		"libhidlbase",
			"libui",
	],		],
	export_static_lib_headers: [		export_static_lib_headers: [
	"SurfaceFlingerProperties",		"SurfaceFlingerProperties",