Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Code cleanup"

Browse Source
This commit is contained in:
Romain Guy
2011-12-12 11:44:43 -08:00
committed by Android (Google) Code Review
parent ee698a01bd 24edca8b52
commit 11326aa1b9
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/hwui/Program.cpp
View File

@@ -29,6 +29,8 @@ Program::Program(const char* vertex, const char* fragment) {
mInitialized = false;
mHasColorUniform = false;
// No need to cache compiled shaders, rely instead on Android's
// persistent shaders cache
GLuint vertexShader = buildShader(vertex, GL_VERTEX_SHADER);
if (vertexShader) {
@@ -135,10 +137,11 @@ void Program::set(const mat4& projectionMatrix, const mat4& modelViewMatrix,
const mat4& transformMatrix, bool offset) {
mat4 t(projectionMatrix);
if (offset) {
// offset screenspace xy by an amount that compensates for typical precision issues
// in GPU hardware that tends to paint hor/vert lines in pixels shifted up and to the left.
// This offset value is based on an assumption that some hardware may use as little
// as 12.4 precision, so we offset by slightly more than 1/16.
// offset screenspace xy by an amount that compensates for typical precision
// issues in GPU hardware that tends to paint hor/vert lines in pixels shifted
// up and to the left.
// This offset value is based on an assumption that some hardware may use as
// little as 12.4 precision, so we offset by slightly more than 1/16.
t.translate(.375, .375, 0);
}
t.multiply(transformMatrix);

3
libs/hwui/ProgramCache.h
View File

@@ -27,6 +27,7 @@
#include "Debug.h"
#include "Program.h"
#include "Properties.h"
namespace android {
namespace uirenderer {
@@ -42,8 +43,6 @@ namespace uirenderer {
#define PROGRAM_LOGD(...)
#endif
// TODO: This should be set in properties
#define PANEL_BIT_DEPTH 20
#define COLOR_COMPONENT_THRESHOLD (1.0f - (0.5f / PANEL_BIT_DEPTH))
#define COLOR_COMPONENT_INV_THRESHOLD (0.5f / PANEL_BIT_DEPTH)

5
libs/hwui/Properties.h
View File

@@ -73,8 +73,11 @@ 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)
#define MB(s) s * 1024 * 1024
#define DEFAULT_TEXTURE_CACHE_SIZE 24.0f
#define DEFAULT_LAYER_CACHE_SIZE 16.0f