wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 735932 - Fix no-alpha ReadPixels on Mac+nVidia - r=bjacob

Browse Source
This commit is contained in:
Jeff Gilbert 2012-08-31 16:47:03 -07:00
parent e635ec0e37
commit 506191ac26
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gfx/gl/GLContext.cpp
View File

@ -2039,14 +2039,43 @@ GLContext::ReadPixelsIntoImageSurface(gfxImageSurface* dest)
GLenum format;
GLenum datatype;
GetOptimalReadFormats(this, format, datatype);
GLsizei width = dest->Width();
GLsizei height = dest->Height();
fReadPixels(0, 0,
dest->Width(), dest->Height(),
width, height,
format, datatype,
dest->Data());
// Check if GL is giving back 1.0 alpha for
// RGBA reads to RGBA images from no-alpha buffers.
#ifdef XP_MACOSX
if (WorkAroundDriverBugs() &&
mVendor == VendorNVIDIA &&
dest->Format() == gfxASurface::ImageFormatARGB32 &&
width && height)
{
GLint alphaBits = 0;
fGetIntegerv(LOCAL_GL_ALPHA_BITS, &alphaBits);
if (!alphaBits) {
const uint32_t alphaMask = GFX_PACKED_PIXEL_NO_PREMULTIPLY(0xff,0,0,0);
uint32_t* itr = (uint32_t*)dest->Data();
uint32_t testPixel = *itr;
if ((testPixel & alphaMask) != alphaMask) {
// We need to set the alpha channel to 1.0 manually.
uint32_t* itrEnd = itr + width*height; // Stride is guaranteed to be width*4.
for (; itr != itrEnd; itr++) {
*itr |= alphaMask;
}
}
}
}
#endif
// Output should be in BGRA, so swap if RGBA.
if (format == LOCAL_GL_RGBA) {
SwapRAndBComponents(dest);