Merge "Add debug flag to print out the EGL configuration used by libhwui" (01391cc0) · Commits · e / os / android_frameworks_base

core/java/android/view/HardwareRenderer.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ public abstract class HardwareRenderer {
		* System property used to debug EGL configuration choice.
		*
		* Possible values:
		* "false", don't print the configuration
		* "choice", print the chosen configuration only
		* "all", print all possible configurations
		*/
		@@ -501,6 +500,8 @@ public abstract class HardwareRenderer {

		abstract GLES20Canvas createCanvas();

		abstract int[] getConfig(boolean dirtyRegions);

		void initializeEgl() {
		synchronized (sEglLock) {
		if (sEgl == null && sEglConfig == null) {
		@@ -552,7 +553,7 @@ public abstract class HardwareRenderer {
		int[] configSpec = getConfig(sDirtyRegions);

		// Debug
		final String debug = SystemProperties.get(PRINT_CONFIG_PROPERTY, "false");
		final String debug = SystemProperties.get(PRINT_CONFIG_PROPERTY, "");
		if ("all".equalsIgnoreCase(debug)) {
		sEgl.eglChooseConfig(sEglDisplay, configSpec, null, 0, configsCount);

		@@ -602,11 +603,9 @@ public abstract class HardwareRenderer {
		Log.d(LOG_TAG, " STENCIL_SIZE = " + value[0]);

		sEgl.eglGetConfigAttrib(sEglDisplay, config, EGL_SURFACE_TYPE, value);
		Log.d(LOG_TAG, " SURFACE_TYPE = " + value[0]);
		Log.d(LOG_TAG, " SURFACE_TYPE = 0x" + Integer.toHexString(value[0]));
		}

		abstract int[] getConfig(boolean dirtyRegions);

		GL createEglSurface(SurfaceHolder holder) throws Surface.OutOfResourcesException {
		// Check preconditions.
		if (sEgl == null) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -2854,7 +2854,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		// display lists to render, force an invalidate to allow the animation to
		// continue drawing another frame
		invalidate(true);
		if (a.hasAlpha()) {
		if (a.hasAlpha() && (child.mPrivateFlags & ALPHA_SET) == ALPHA_SET) {
		// alpha animations should cause the child to recreate its display list
		child.invalidate(true);
		}