From f877308f77f7c6f3edd91618a092207dd3be9077 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Thu, 12 Jul 2012 18:01:00 -0700 Subject: Remove obsolete optimization Change-Id: I2d43c009c62a7f4a4a2e0a6303bdfa692c4b8c8c --- core/java/android/view/View.java | 3 +-- core/java/android/view/ViewConfiguration.java | 18 ------------------ libs/hwui/OpenGLRenderer.cpp | 5 ++--- libs/hwui/Program.h | 4 ++-- libs/hwui/Properties.h | 3 --- 5 files changed, 5 insertions(+), 28 deletions(-) diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 5f8c75a..0dc58a2 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -10128,8 +10128,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @ViewDebug.ExportedProperty(category = "drawing") public boolean isOpaque() { return (mPrivateFlags & OPAQUE_MASK) == OPAQUE_MASK && - ((mTransformationInfo != null ? mTransformationInfo.mAlpha : 1) - >= 1.0f - ViewConfiguration.ALPHA_THRESHOLD); + ((mTransformationInfo != null ? mTransformationInfo.mAlpha : 1.0f) >= 1.0f); } /** diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 823befb..107f1cc 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -30,24 +30,6 @@ import android.util.SparseArray; */ public class ViewConfiguration { /** - * Expected bit depth of the display panel. - * - * @hide - */ - public static final float PANEL_BIT_DEPTH = 24; - - /** - * Minimum alpha required for a view to draw. - * - * @hide - */ - public static final float ALPHA_THRESHOLD = 0.5f / PANEL_BIT_DEPTH; - /** - * @hide - */ - public static final float ALPHA_THRESHOLD_INT = 0x7f / PANEL_BIT_DEPTH; - - /** * Defines the width of the horizontal scrollbar and the height of the vertical scrollbar in * dips */ diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index c92bead..a755320 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -45,8 +45,7 @@ namespace uirenderer { #define RAD_TO_DEG (180.0f / 3.14159265f) #define MIN_ANGLE 0.001f -// TODO: This should be set in properties -#define ALPHA_THRESHOLD (0x7f / PANEL_BIT_DEPTH) +#define ALPHA_THRESHOLD 0 #define FILTER(paint) (paint && paint->isFilterBitmap() ? GL_LINEAR : GL_NEAREST) @@ -449,7 +448,7 @@ int OpenGLRenderer::saveLayer(float left, float top, float right, float bottom, int OpenGLRenderer::saveLayerAlpha(float left, float top, float right, float bottom, int alpha, int flags) { - if (alpha >= 255 - ALPHA_THRESHOLD) { + if (alpha >= 255) { return saveLayer(left, top, right, bottom, NULL, flags); } else { SkPaint paint; diff --git a/libs/hwui/Program.h b/libs/hwui/Program.h index eb9ee7b..e9c666b 100644 --- a/libs/hwui/Program.h +++ b/libs/hwui/Program.h @@ -41,8 +41,8 @@ namespace uirenderer { #define PROGRAM_LOGD(...) #endif -#define COLOR_COMPONENT_THRESHOLD (1.0f - (0.5f / PANEL_BIT_DEPTH)) -#define COLOR_COMPONENT_INV_THRESHOLD (0.5f / PANEL_BIT_DEPTH) +#define COLOR_COMPONENT_THRESHOLD 1.0f +#define COLOR_COMPONENT_INV_THRESHOLD 0.0f #define PROGRAM_KEY_TEXTURE 0x1 #define PROGRAM_KEY_A8_TEXTURE 0x2 diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h index 7854729..c0311fb 100644 --- a/libs/hwui/Properties.h +++ b/libs/hwui/Properties.h @@ -78,9 +78,6 @@ enum DebugLevel { #define PROPERTY_TEXT_BLACK_GAMMA_THRESHOLD "ro.text_gamma.black_threshold" #define PROPERTY_TEXT_WHITE_GAMMA_THRESHOLD "ro.text_gamma.white_threshold" -// TODO: This should be set by a system property -#define PANEL_BIT_DEPTH 20 - // Converts a number of mega-bytes into bytes #define MB(s) s * 1024 * 1024 -- cgit v1.1