Merge "Fix 9patches' limitation of 32 empty quads" (fb6c743c) · Commits · e / os / android_frameworks_base

libs/hwui/Patch.cpp

+8 −11

Original line number	Diff line number	Diff line
		@@ -56,17 +56,14 @@ TextureVertex* Patch::createMesh(const float bitmapWidth, const float bitmapHeig
		float width, float height, const UvMapper& mapper, const Res_png_9patch* patch) {
		if (vertices) return vertices;

		const uint32_t* colors = &patch->colors[0];
		const int8_t numColors = patch->numColors;

		mColorKey = 0;
		int8_t emptyQuads = 0;
		mColors = patch->colors;

		const int8_t numColors = patch->numColors;
		if (uint8_t(numColors) < sizeof(uint32_t) * 4) {
		for (int8_t i = 0; i < numColors; i++) {
		if (colors[i] == 0x0) {
		if (mColors[i] == 0x0) {
		emptyQuads++;
		mColorKey \|= 0x1 << i;
		}
		}
		}
		@@ -221,11 +218,11 @@ void Patch::generateQuad(TextureVertex*& vertex, float x1, float y1, float x2, f
		if (y2 < 0.0f) y2 = 0.0f;

		// Skip degenerate and transparent (empty) quads
		if (((mColorKey >> oldQuadCount) & 0x1) \|\| x1 >= x2 \|\| y1 >= y2) {
		if ((mColors[oldQuadCount] == 0) \|\| x1 >= x2 \|\| y1 >= y2) {
		#if DEBUG_PATCHES_EMPTY_VERTICES
		PATCH_LOGD(" quad %d (empty)", oldQuadCount);
		PATCH_LOGD(" left, top = %.2f, %.2f\t\tu1, v1 = %.4f, %.4f", x1, y1, u1, v1);
		PATCH_LOGD(" right, bottom = %.2f, %.2f\t\tu2, v2 = %.4f, %.4f", x2, y2, u2, v2);
		PATCH_LOGD(" left, top = %.2f, %.2f\t\tu1, v1 = %.8f, %.8f", x1, y1, u1, v1);
		PATCH_LOGD(" right, bottom = %.2f, %.2f\t\tu2, v2 = %.8f, %.8f", x2, y2, u2, v2);
		#endif
		return;
		}
		@@ -248,8 +245,8 @@ void Patch::generateQuad(TextureVertex*& vertex, float x1, float y1, float x2, f

		#if DEBUG_PATCHES_VERTICES
		PATCH_LOGD(" quad %d", oldQuadCount);
		PATCH_LOGD(" left, top = %.2f, %.2f\t\tu1, v1 = %.4f, %.4f", x1, y1, u1, v1);
		PATCH_LOGD(" right, bottom = %.2f, %.2f\t\tu2, v2 = %.4f, %.4f", x2, y2, u2, v2);
		PATCH_LOGD(" left, top = %.2f, %.2f\t\tu1, v1 = %.8f, %.8f", x1, y1, u1, v1);
		PATCH_LOGD(" right, bottom = %.2f, %.2f\t\tu2, v2 = %.8f, %.8f", x2, y2, u2, v2);
		#endif
		}

libs/hwui/Patch.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ private:
		void generateQuad(TextureVertex*& vertex, float x1, float y1, float x2, float y2,
		float u1, float v1, float u2, float v2, uint32_t& quadCount);

		uint32_t mColorKey;
		uint32_t* mColors;
		UvMapper mUvMapper;
		}; // struct Patch

libs/hwui/Extensions.cpp

+1 −1

File changed.

Contains only whitespace changes.