Bug 742091 - Texture format detection broken by 740372. r=gwright

This commit is contained in:
Oleg Romashin 2012-04-04 14:32:21 -07:00
parent 269029218e
commit 4f48b91fcf

View File

@ -851,20 +851,16 @@ public:
mUpdateFormat = gfxASurface::FormatFromContent(GetContentType());
if (gUseBackingSurface) {
if (mUpdateFormat == gfxASurface::ImageFormatRGB24) {
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
mUpdateFormat = gfxASurface::ImageFormatRGB16_565;
if (mUpdateFormat != gfxASurface::ImageFormatARGB32) {
mShaderType = RGBXLayerProgramType;
#else
mUpdateFormat = gfxASurface::ImageFormatARGB32;
mShaderType = RGBALayerProgramType;
#endif
} else {
mShaderType = RGBALayerProgramType;
}
Resize(aSize);
} else {
if (mUpdateFormat == gfxASurface::ImageFormatRGB24) {
if (mUpdateFormat == gfxASurface::ImageFormatRGB16_565) {
mShaderType = RGBXLayerProgramType;
} else if (mUpdateFormat == gfxASurface::ImageFormatRGB24) {
// RGB24 means really RGBX for Thebes, which means we have to
// use the right shader and ignore the uninitialized alpha
// value.