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

am 151921a6: Merge change 24977 into eclair

Browse Source 
Merge commit '151921a62485f2141ad1316076c196ef00e1b421' into eclair-plus-aosp

* commit '151921a62485f2141ad1316076c196ef00e1b421':
  add support for RGBX_8888 surfaces in SurfaceFlinger
This commit is contained in:
Mathias Agopian
2009-09-14 18:21:10 -07:00
committed by Android Git Automerger
parent cb805e5caf 151921a624
commit 515a10c4b3
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/surfaceflinger/Buffer.cpp
View File

@@ -106,6 +106,9 @@ status_t Buffer::initSize(uint32_t w, uint32_t h, PixelFormat format,
// the requested flags should be honored. // the requested flags should be honored.
usage = reqUsage | BufferAllocator::USAGE_HW_TEXTURE; usage = reqUsage | BufferAllocator::USAGE_HW_TEXTURE;
} }
if (format == PIXEL_FORMAT_RGBX_8888)
format = PIXEL_FORMAT_RGBA_8888;
err = allocator.alloc(w, h, format, usage, &handle, &stride); err = allocator.alloc(w, h, format, usage, &handle, &stride);
if (err == NO_ERROR) { if (err == NO_ERROR) {

3
libs/surfaceflinger/Layer.cpp
View File

@@ -176,6 +176,9 @@ void Layer::reloadTexture(const Region& dirty)
// this failed, for instance, because we don't support // this failed, for instance, because we don't support
// NPOT. // NPOT.
// FIXME: do something! // FIXME: do something!
LOGD("layer=%p, glEGLImageTargetTexture2DOES(%d) "
"failed err=0x%04x",
this, mTextures[index].image, error);
mFlags &= ~DisplayHardware::DIRECT_TEXTURE; mFlags &= ~DisplayHardware::DIRECT_TEXTURE;
} else { } else {
// Everything went okay! // Everything went okay!

6
libs/surfaceflinger/LayerBase.cpp
View File

@@ -590,7 +590,8 @@ regular:
glTexImage2D(GL_TEXTURE_2D, 0, glTexImage2D(GL_TEXTURE_2D, 0,
GL_RGBA, texture_w, texture_h, 0, GL_RGBA, texture_w, texture_h, 0,
GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, data); GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, data);
} else if (t.format == GGL_PIXEL_FORMAT_RGBA_8888) { } else if (t.format == GGL_PIXEL_FORMAT_RGBA_8888 ||
t.format == GGL_PIXEL_FORMAT_RGBX_8888) {
glTexImage2D(GL_TEXTURE_2D, 0, glTexImage2D(GL_TEXTURE_2D, 0,
GL_RGBA, texture_w, texture_h, 0, GL_RGBA, texture_w, texture_h, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data); GL_RGBA, GL_UNSIGNED_BYTE, data);
@@ -620,7 +621,8 @@ regular:
0, bounds.top, t.width, bounds.height(), 0, bounds.top, t.width, bounds.height(),
GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4,
t.data + bounds.top*t.stride*2); t.data + bounds.top*t.stride*2);
} else if (t.format == GGL_PIXEL_FORMAT_RGBA_8888) { } else if (t.format == GGL_PIXEL_FORMAT_RGBA_8888 ||
t.format == GGL_PIXEL_FORMAT_RGBX_8888) {
glTexSubImage2D(GL_TEXTURE_2D, 0, glTexSubImage2D(GL_TEXTURE_2D, 0,
0, bounds.top, t.width, bounds.height(), 0, bounds.top, t.width, bounds.height(),
GL_RGBA, GL_UNSIGNED_BYTE, GL_RGBA, GL_UNSIGNED_BYTE,