Merge "Only use the first available suffix value when loading drivers." into main (ff9f151b) · Commits · e / devices / smdk4412 / android_frameworks_native

opengl/libs/EGL/Loader.cpp

+14 −9

Original line number	Original line	Diff line number	Diff line
	@@ -137,12 +137,14 @@ static void* load_wrapper(const char* path) {
	#endif		#endif
	#endif		#endif

	static const char* DRIVER_SUFFIX_PROPERTY = "ro.hardware.egl";		static const char* PERSIST_DRIVER_SUFFIX_PROPERTY = "persist.graphics.egl";
			static const char* RO_DRIVER_SUFFIX_PROPERTY = "ro.hardware.egl";
			static const char* RO_BOARD_PLATFORM_PROPERTY = "ro.board.platform";

	static const char* HAL_SUBNAME_KEY_PROPERTIES[3] = {		static const char* HAL_SUBNAME_KEY_PROPERTIES[3] = {
	"persist.graphics.egl",		PERSIST_DRIVER_SUFFIX_PROPERTY,
	DRIVER_SUFFIX_PROPERTY,		RO_DRIVER_SUFFIX_PROPERTY,
	"ro.board.platform",		RO_BOARD_PLATFORM_PROPERTY,
	};		};

	static bool should_unload_system_driver(egl_connection_t* cnx) {		static bool should_unload_system_driver(egl_connection_t* cnx) {
	@@ -245,17 +247,20 @@ void* Loader::open(egl_connection_t* cnx)
	continue;		continue;
	}		}
	hnd = attempt_to_load_system_driver(cnx, prop.c_str(), true);		hnd = attempt_to_load_system_driver(cnx, prop.c_str(), true);
	if (hnd) {		if (!hnd) {
	break;		ALOGD("Failed to load drivers from property %s with value %s", key, prop.c_str());
	} else if (strcmp(key, DRIVER_SUFFIX_PROPERTY) == 0) {
	failToLoadFromDriverSuffixProperty = true;		failToLoadFromDriverSuffixProperty = true;
	}		}

			// Abort regardless of whether subsequent properties are set, the value must be set
			// correctly with the first property that has a value.
			break;
	}		}
	}		}

	if (!hnd) {		if (!hnd) {
	// Can't find graphics driver by appending system properties, now search for the exact name		// Can't find graphics driver by appending the value from system properties, now search for
	// without any suffix of the GLES userspace driver in both locations.		// the exact name without any suffix of the GLES userspace driver in both locations.
	// i.e.:		// i.e.:
	// libGLES.so, or:		// libGLES.so, or:
	// libEGL.so, libGLESv1_CM.so, libGLESv2.so		// libEGL.so, libGLESv1_CM.so, libGLESv2.so