am a70cd049: Merge "Add dithering to gradients" into jb-mr1-dev (e0cf4bfb) · Commits · e / os / android_frameworks_base

libs/hwui/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ ifeq ($(USE_OPENGL_RENDERER),true)
		Caches.cpp \
		DisplayListLogBuffer.cpp \
		DisplayListRenderer.cpp \
		Dither.cpp \
		FboCache.cpp \
		GradientCache.cpp \
		LayerCache.cpp \

libs/hwui/Caches.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -252,6 +252,7 @@ void Caches::flush(FlushMode mode) {
		dropShadowCache.clear();
		gradientCache.clear();
		fontRenderer->clear();
		dither.clear();
		// fall through
		case kFlushMode_Moderate:
		fontRenderer->flush();

libs/hwui/Caches.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@
		#include "TextDropShadowCache.h"
		#include "FboCache.h"
		#include "ResourceCache.h"
		#include "Dither.h"

		namespace android {
		namespace uirenderer {
		@@ -250,6 +251,7 @@ public:
		TextDropShadowCache dropShadowCache;
		FboCache fboCache;
		ResourceCache resourceCache;
		Dither dither;

		GammaFontRenderer* fontRenderer;

libs/hwui/Dither.cpp

0 → 100755

+84 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 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.
		*/

		#include "Caches.h"
		#include "Dither.h"

		namespace android {
		namespace uirenderer {

		///////////////////////////////////////////////////////////////////////////////
		// Defines
		///////////////////////////////////////////////////////////////////////////////

		// Must be a power of two
		#define DITHER_KERNEL_SIZE 4

		///////////////////////////////////////////////////////////////////////////////
		// Lifecycle
		///////////////////////////////////////////////////////////////////////////////

		void Dither::bindDitherTexture() {
		if (!mInitialized) {
		const uint8_t pattern[] = {
		0, 8, 2, 10,
		12, 4, 14, 6,
		3, 11, 1, 9,
		15, 7, 13, 5
		};

		glGenTextures(1, &mDitherTexture);
		glBindTexture(GL_TEXTURE_2D, mDitherTexture);

		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

		glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, DITHER_KERNEL_SIZE, DITHER_KERNEL_SIZE, 0,
		GL_ALPHA, GL_UNSIGNED_BYTE, &pattern);

		mInitialized = true;
		} else {
		glBindTexture(GL_TEXTURE_2D, mDitherTexture);
		}
		}

		void Dither::clear() {
		if (mInitialized) {
		glDeleteTextures(1, &mDitherTexture);
		}
		}

		///////////////////////////////////////////////////////////////////////////////
		// Program management
		///////////////////////////////////////////////////////////////////////////////

		void Dither::setupProgram(Program* program, GLuint* textureUnit) {
		GLuint textureSlot = (*textureUnit)++;
		Caches::getInstance().activeTexture(textureSlot);

		bindDitherTexture();

		glUniform1i(program->getUniform("ditherSampler"), textureSlot);
		glUniform1f(program->getUniform("ditherSize"), 1.0f / DITHER_KERNEL_SIZE);
		}

		}; // namespace uirenderer
		}; // namespace android

libs/hwui/Dither.h

0 → 100755

+47 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 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.
		*/

		#ifndef ANDROID_HWUI_DITHER_H
		#define ANDROID_HWUI_DITHER_H

		#include <GLES2/gl2.h>

		#include "Program.h"

		namespace android {
		namespace uirenderer {

		/**
		* Handles dithering for programs.
		*/
		class Dither {
		public:
		Dither(): mInitialized(false), mDitherTexture(0) { }

		void clear();
		void setupProgram(Program* program, GLuint* textureUnit);

		private:
		void bindDitherTexture();

		bool mInitialized;
		GLuint mDitherTexture;
		};

		}; // namespace uirenderer
		}; // namespace android

		#endif // ANDROID_HWUI_DITHER_H