Merge "Linear blending, step 1" (21986f2a) · Commits · e / os / android_frameworks_base

Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -288,7 +288,6 @@ LOCAL_SRC_FILES += \
		core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
		core/java/android/view/IApplicationToken.aidl \
		core/java/android/view/IAppTransitionAnimationSpecsFuture.aidl \
		core/java/android/view/IAssetAtlas.aidl \
		core/java/android/view/IDockedStackListener.aidl \
		core/java/android/view/IGraphicsStats.aidl \
		core/java/android/view/IInputFilter.aidl \

compiled-classes-phone

+0 −11

Original line number	Diff line number	Diff line
		@@ -1168,14 +1168,6 @@ android.drm.DrmManagerClient$OnEventListener
		android.drm.DrmManagerClient$OnInfoListener
		android.drm.DrmOutputStream
		android.drm.DrmSupportInfo
		android.graphics.Atlas
		android.graphics.Atlas$Entry
		android.graphics.Atlas$Policy
		android.graphics.Atlas$SlicePolicy
		android.graphics.Atlas$SlicePolicy$Cell
		android.graphics.Atlas$SlicePolicy$MinAreaSplitDecision
		android.graphics.Atlas$SlicePolicy$SplitDecision
		android.graphics.Atlas$Type
		android.graphics.Bitmap
		android.graphics.Bitmap$1
		android.graphics.Bitmap$CompressFormat
		@@ -4264,9 +4256,6 @@ android.view.IAppTransitionAnimationSpecsFuture$Stub
		android.view.IAppTransitionAnimationSpecsFuture$Stub$Proxy
		android.view.IApplicationToken
		android.view.IApplicationToken$Stub
		android.view.IAssetAtlas
		android.view.IAssetAtlas$Stub
		android.view.IAssetAtlas$Stub$Proxy
		android.view.IDockedStackListener
		android.view.IDockedStackListener$Stub
		android.view.IDockedStackListener$Stub$Proxy

core/java/android/view/IAssetAtlas.aidl

deleted100644 → 0

+0 −54

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2013, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.view;

		import android.view.GraphicBuffer;

		/**
		* Programming interface to the system assets atlas. This atlas, when
		* present, holds preloaded drawable in a single, shareable graphics
		* buffer. This allows multiple processes to share the same data to
		* save up on memory.
		*
		* @hide
		*/
		interface IAssetAtlas {
		/**
		* Indicates whether the atlas is compatible with the specified
		* parent process id. If the atlas' ppid does not match, this
		* method will return false.
		*/
		boolean isCompatible(int ppid);

		/**
		* Returns the atlas buffer (texture) or null if the atlas is
		* not available yet.
		*/
		GraphicBuffer getBuffer();

		/**
		* Returns the map of the bitmaps stored in the atlas or null
		* if the atlas is not available yet.
		*
		* Each bitmap is represented by several entries in the array:
		* long0: SkBitmap*, the native bitmap object
		* long1: x position
		* long2: y position
		* long3: rotated, 1 if the bitmap must be rotated, 0 otherwise
		*/
		long[] getMap();
		}

core/java/android/view/ThreadedRenderer.java

+0 −28

Original line number	Diff line number	Diff line
		@@ -916,7 +916,6 @@ public final class ThreadedRenderer {
		mInitialized = true;
		initSched(context, renderProxy);
		initGraphicsStats(context, renderProxy);
		initAssetAtlas(context, renderProxy);
		}

		private static void initSched(Context context, long renderProxy) {
		@@ -944,32 +943,6 @@ public final class ThreadedRenderer {
		Log.w(LOG_TAG, "Could not acquire gfx stats buffer", t);
		}
		}

		private static void initAssetAtlas(Context context, long renderProxy) {
		IBinder binder = ServiceManager.getService("assetatlas");
		if (binder == null) return;

		IAssetAtlas atlas = IAssetAtlas.Stub.asInterface(binder);
		try {
		if (atlas.isCompatible(android.os.Process.myPpid())) {
		GraphicBuffer buffer = atlas.getBuffer();
		if (buffer != null) {
		long[] map = atlas.getMap();
		if (map != null) {
		nSetAtlas(renderProxy, buffer, map);
		}
		// If IAssetAtlas is not the same class as the IBinder
		// we are using a remote service and we can safely
		// destroy the graphic buffer
		if (atlas.getClass() != binder.getClass()) {
		buffer.destroy();
		}
		}
		}
		} catch (RemoteException e) {
		Log.w(LOG_TAG, "Could not acquire atlas", e);
		}
		}
		}

		void addFrameMetricsObserver(FrameMetricsObserver observer) {
		@@ -984,7 +957,6 @@ public final class ThreadedRenderer {

		static native void setupShadersDiskCache(String cacheFile);

		private static native void nSetAtlas(long nativeProxy, GraphicBuffer buffer, long[] map);
		private static native void nSetProcessStatsBuffer(long nativeProxy, int fd);
		private static native int nGetRenderThreadTid(long nativeProxy);

core/jni/Android.mk

+8 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,14 @@ ifneq ($(ENABLE_CPUSETS),)
		LOCAL_CFLAGS += -DENABLE_CPUSETS
		endif

		# TODO: Linear blending should be enabled by default, but we are
		# TODO: making it an opt-in while it's a work in progress
		# TODO: The final test should be:
		# TODO: ifneq ($(TARGET_ENABLE_LINEAR_BLENDING),false)
		ifeq ($(TARGET_ENABLE_LINEAR_BLENDING),true)
		hwui_cflags += -DANDROID_ENABLE_LINEAR_BLENDING
		endif

		LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

		LOCAL_CFLAGS += -DU_USING_ICU_NAMESPACE=0