ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 110bc6a5: am 2eaefe19: Simplify handling of opaque layers in shader generation

Browse Source 
* commit '110bc6a50fb0c06053bef83afe5075f7e25c5093':
  Simplify handling of opaque layers in shader generation
This commit is contained in:
Mathias Agopian 2013-08-15 17:01:12 -07:00 committed by Android Git Automerger
commit 9ab41030a8
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
services/surfaceflinger/RenderEngine/ProgramCache.cpp
View File

@ -140,28 +140,16 @@ String8 ProgramCache::generateFragmentShader(const Key& needs) {
} else {
fs << "gl_FragColor = color;";
}
if (needs.isOpaque()) {
fs << "gl_FragColor.a = 1.0;";
}
if (needs.hasPlaneAlpha()) {
// modulate the alpha value with planeAlpha
if (needs.isPremultiplied()) {
// ... and the color too if we're premultiplied
if (needs.isOpaque()) {
// ... we're opaque, only premultiply the color component
fs << "gl_FragColor.rgb *= alphaPlane;"
<< "gl_FragColor.a = alphaPlane;";
} else {
fs << "gl_FragColor *= alphaPlane;";
}
fs << "gl_FragColor *= alphaPlane;";
} else {
// not premultiplied
if (needs.isOpaque()) {
fs << "gl_FragColor.a = alphaPlane;";
} else {
fs << "gl_FragColor.a *= alphaPlane;";
}
}
} else {
if (needs.isOpaque()) {
fs << "gl_FragColor.a = 1.0;";
fs << "gl_FragColor.a *= alphaPlane;";
}
}
fs << dedent << "}";