drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5be7de5f: Merge "fix a bug where fading in/out of opaque 32-bits windows wasn\'t working" into kraken

Browse Source
This commit is contained in:
Mathias Agopian
2010-06-01 16:01:29 -07:00
committed by Android Git Automerger
parent 27d1e6568f 5be7de5f62
commit 7258fd92d0
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/surfaceflinger/LayerBase.cpp
View File

@ -379,33 +379,21 @@ void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
GLenum src = mPremultipliedAlpha ? GL_ONE : GL_SRC_ALPHA;
if (UNLIKELY(s.alpha < 0xFF)) { if (UNLIKELY(s.alpha < 0xFF)) {
// We have an alpha-modulation. We need to modulate all
// texture components by alpha because we're always using
// premultiplied alpha.
// If the texture doesn't have an alpha channel we can
// use REPLACE and switch to non premultiplied alpha
// blending (SRCA/ONE_MINUS_SRCA).
GLenum env, src;
if (needsBlending()) {
env = GL_MODULATE;
src = mPremultipliedAlpha ? GL_ONE : GL_SRC_ALPHA;
} else {
env = GL_REPLACE;
src = GL_SRC_ALPHA;
}
const GLfloat alpha = s.alpha * (1.0f/255.0f); const GLfloat alpha = s.alpha * (1.0f/255.0f);
glColor4f(alpha, alpha, alpha, alpha); if (mPremultipliedAlpha) {
glColor4f(alpha, alpha, alpha, alpha);
} else {
glColor4f(1, 1, 1, alpha);
}
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(src, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(src, GL_ONE_MINUS_SRC_ALPHA);
glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, env); glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
} else { } else {
glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
glColor4f(1, 1, 1, 1); glColor4f(1, 1, 1, 1);
glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
if (needsBlending()) { if (needsBlending()) {
GLenum src = mPremultipliedAlpha ? GL_ONE : GL_SRC_ALPHA;
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(src, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(src, GL_ONE_MINUS_SRC_ALPHA);
} else { } else {

15
libs/ui/GraphicBuffer.cpp
View File

@ -122,11 +122,20 @@ status_t GraphicBuffer::reallocate(uint32_t w, uint32_t h, PixelFormat f,
status_t GraphicBuffer::initSize(uint32_t w, uint32_t h, PixelFormat format, status_t GraphicBuffer::initSize(uint32_t w, uint32_t h, PixelFormat format,
uint32_t reqUsage) uint32_t reqUsage)
{ {
if (format == PIXEL_FORMAT_RGBX_8888)
format = PIXEL_FORMAT_RGBA_8888;
GraphicBufferAllocator& allocator = GraphicBufferAllocator::get(); GraphicBufferAllocator& allocator = GraphicBufferAllocator::get();
status_t err = allocator.alloc(w, h, format, reqUsage, &handle, &stride); status_t err = allocator.alloc(w, h, format, reqUsage, &handle, &stride);
if (err<0 && format == PIXEL_FORMAT_RGBX_8888) {
/*
* There is currently a bug with some gralloc implementations
* not supporting RGBX_8888. In this case, we revert to using RGBA_8888
* which is not exactly the same, as GL_REPLACE will yield a different
* result.
*/
format = PIXEL_FORMAT_RGBA_8888;
err = allocator.alloc(w, h, format, reqUsage, &handle, &stride);
}
if (err == NO_ERROR) { if (err == NO_ERROR) {
this->width = w; this->width = w;
this->height = h; this->height = h;