Merge "Dirty layers in the area covered by a drawBitmapMesh() call Bug #3410827" (eefdd709) · Commits · e / os / android_frameworks_base

libs/hwui/OpenGLRenderer.cpp

+28 −1

Original line number	Diff line number	Diff line
		@@ -1110,6 +1110,17 @@ void OpenGLRenderer::drawBitmapMesh(SkBitmap* bitmap, int meshWidth, int meshHei

		const uint32_t count = meshWidth * meshHeight * 6;

		float left = FLT_MAX;
		float top = FLT_MAX;
		float right = FLT_MIN;
		float bottom = FLT_MIN;

		#if RENDER_LAYERS_AS_REGIONS
		bool hasActiveLayer = hasLayer();
		#else
		bool hasActiveLayer = false;
		#endif

		// TODO: Support the colors array
		TextureVertex mesh[count];
		TextureVertex* vertex = mesh;
		@@ -1138,12 +1149,28 @@ void OpenGLRenderer::drawBitmapMesh(SkBitmap* bitmap, int meshWidth, int meshHei
		TextureVertex::set(vertex++, vertices[ax], vertices[ay], u1, v2);
		TextureVertex::set(vertex++, vertices[cx], vertices[cy], u2, v1);
		TextureVertex::set(vertex++, vertices[dx], vertices[dy], u2, v2);

		#if RENDER_LAYERS_AS_REGIONS
		if (hasActiveLayer) {
		// TODO: This could be optimized to avoid unnecessary ops
		left = fminf(left, fminf(vertices[ax], fminf(vertices[bx], vertices[cx])));
		top = fminf(top, fminf(vertices[ay], fminf(vertices[by], vertices[cy])));
		right = fmaxf(right, fmaxf(vertices[ax], fmaxf(vertices[bx], vertices[cx])));
		bottom = fmaxf(bottom, fmaxf(vertices[ay], fmaxf(vertices[by], vertices[cy])));
		}
		#endif
		}
		}

		#if RENDER_LAYERS_AS_REGIONS
		if (hasActiveLayer) {
		dirtyLayer(left, top, right, bottom, *mSnapshot->transform);
		}
		#endif

		drawTextureMesh(0.0f, 0.0f, 1.0f, 1.0f, texture->id, alpha / 255.0f,
		mode, texture->blend, &mesh[0].position[0], &mesh[0].texture[0],
		GL_TRIANGLES, count);
		GL_TRIANGLES, count, false, false, 0, false, false);
		}

		void OpenGLRenderer::drawBitmap(SkBitmap* bitmap,

tests/HwAccelerationTest/AndroidManifest.xml

+10 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,15 @@
		</intent-filter>
		</activity>

		<activity
		android:name="BitmapMeshLayerActivity"
		android:label="_BitmapMeshLayer">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.LAUNCHER" />
		</intent-filter>
		</activity>

		<activity
		android:name="MarqueeActivity"
		android:label="_Marquee">

tests/HwAccelerationTest/src/com/android/test/hwui/BitmapMeshActivity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ public class BitmapMeshActivity extends Activity {
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		final BitmapMeshView view = new BitmapMeshView(this);
		view.setDrawingCacheEnabled(true);
		setContentView(view);
		}

tests/HwAccelerationTest/src/com/android/test/hwui/BitmapMeshLayerActivity.java

0 → 100644

+78 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 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 com.android.test.hwui;

		import android.app.Activity;
		import android.content.Context;
		import android.graphics.Bitmap;
		import android.graphics.BitmapFactory;
		import android.graphics.Canvas;
		import android.graphics.Paint;
		import android.os.Bundle;
		import android.view.View;

		@SuppressWarnings({"UnusedDeclaration"})
		public class BitmapMeshLayerActivity extends Activity {
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		final BitmapMeshView view = new BitmapMeshView(this);
		view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
		setContentView(view);
		}

		static class BitmapMeshView extends View {
		private Paint mBitmapPaint;
		private final Bitmap mBitmap1;
		private float[] mVertices;
		private int[] mColors;

		BitmapMeshView(Context c) {
		super(c);

		mBitmap1 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset1);

		final float width = mBitmap1.getWidth() / 3.0f;
		final float height = mBitmap1.getHeight() / 3.0f;

		mVertices = new float[] {
		0.0f, 0.0f, width, 0.0f, width * 2, 0.0f, width * 3, 0.0f,
		0.0f, height, width, height, width * 2, height, width * 4, height,
		0.0f, height * 2, width, height * 2, width * 2, height * 2, width * 3, height * 2,
		0.0f, height * 4, width, height * 4, width * 2, height * 4, width * 4, height * 4,
		};

		mColors = new int[] {
		0xffff0000, 0xff00ff00, 0xff0000ff, 0xffff0000,
		0xff0000ff, 0xffff0000, 0xff00ff00, 0xff00ff00,
		0xff00ff00, 0xff0000ff, 0xffff0000, 0xff00ff00,
		0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ff0000,
		};
		}

		@Override
		protected void onDraw(Canvas canvas) {
		super.onDraw(canvas);

		canvas.translate(100, 100);
		canvas.drawBitmapMesh(mBitmap1, 3, 3, mVertices, 0, null, 0, null);

		canvas.translate(400, 0);
		canvas.drawBitmapMesh(mBitmap1, 3, 3, mVertices, 0, mColors, 0, null);
		}
		}
		}