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

Merge "Change the dither texture's swizzling" into jb-mr2-dev

Browse Source
This commit is contained in:
Romain Guy
2013-04-09 21:18:45 +00:00
committed by Android (Google) Code Review
parent 2355d13154 032d47af73
commit 4a745e78bb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/Dither.cpp
View File

@@ -38,6 +38,10 @@ void Dither::bindDitherTexture() {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
if (useFloatTexture) { if (useFloatTexture) {
// We use a R16F texture, let's remap the alpha channel to the
// red channel to avoid changing the shader sampling code on GL ES 3.0+
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED);
float dither = 1.0f / (255.0f * DITHER_KERNEL_SIZE * DITHER_KERNEL_SIZE); float dither = 1.0f / (255.0f * DITHER_KERNEL_SIZE * DITHER_KERNEL_SIZE);
const GLfloat pattern[] = { const GLfloat pattern[] = {
0 * dither, 8 * dither, 2 * dither, 10 * dither, 0 * dither, 8 * dither, 2 * dither, 10 * dither,

2
libs/hwui/ProgramCache.cpp
View File

@@ -186,7 +186,7 @@ const char* gFS_Main_Dither[2] = {
// ES 2.0 // ES 2.0
"texture2D(ditherSampler, ditherTexCoords).a * " STR(DITHER_KERNEL_SIZE_INV_SQUARE), "texture2D(ditherSampler, ditherTexCoords).a * " STR(DITHER_KERNEL_SIZE_INV_SQUARE),
// ES 3.0 // ES 3.0
"texture2D(ditherSampler, ditherTexCoords).r" "texture2D(ditherSampler, ditherTexCoords).a"
}; };
const char* gFS_Main_AddDitherToGradient = const char* gFS_Main_AddDitherToGradient =
" gradientColor += %s;\n"; " gradientColor += %s;\n";