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

Back out 2175db811fad (bug 734081) due to Android reftest failures.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-03-08 18:41:28 -05:00
parent 7a09a537af
commit 4d57056b4d
3 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gfx/gl/GLContextProviderEGL.cpp
View File

@ -42,9 +42,6 @@
#include "mozilla/Preferences.h"
#include "mozilla/Util.h"
#include "nsIScreen.h"
#include "nsIScreenManager.h"
#if defined(XP_UNIX)
#ifdef MOZ_WIDGET_GTK2
@ -2193,6 +2190,13 @@ static const EGLint kEGLConfigAttribsRGBA32[] = {
LOCAL_EGL_NONE
};
// This struct is used only by CreateConfig below, but ISO C++98 forbids
// instantiating a template dependent on a locally-defined type. Boo-urns!
struct EGLAttribs {
gfxASurface::gfxImageFormat mFormat;
const EGLint* mAttribs;
};
// Return true if a suitable EGLConfig was found and pass it out
// through aConfig. Return false otherwise.
//
@ -2201,41 +2205,47 @@ static const EGLint kEGLConfigAttribsRGBA32[] = {
static bool
CreateConfig(EGLConfig* aConfig)
{
nsCOMPtr<nsIScreenManager> screenMgr = do_GetService("@mozilla.org/gfx/screenmanager;1");
nsCOMPtr<nsIScreen> screen;
screenMgr->GetPrimaryScreen(getter_AddRefs(screen));
PRInt32 depth = 24;
screen->GetColorDepth(&depth);
EGLAttribs attribsToTry[] = {
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
// Prefer r5g6b5 for potential savings in memory bandwidth.
// This needs to be reevaluated for newer devices.
{ gfxASurface::ImageFormatRGB16_565, kEGLConfigAttribsRGB16 },
#endif
{ gfxASurface::ImageFormatARGB32, kEGLConfigAttribsRGBA32 },
};
EGLConfig configs[64];
gfxASurface::gfxImageFormat format;
const EGLint* attribs = depth == 16 ? kEGLConfigAttribsRGB16 :
kEGLConfigAttribsRGBA32;
EGLint ncfg = ArrayLength(configs);
for (unsigned i = 0; i < ArrayLength(attribsToTry); ++i) {
const EGLAttribs& attribs = attribsToTry[i];
EGLint ncfg = ArrayLength(configs);
if (!sEGLLibrary.fChooseConfig(EGL_DISPLAY(), attribs,
configs, ncfg, &ncfg) ||
ncfg < 1) {
return false;
}
for (int j = 0; j < ncfg; ++j) {
EGLConfig config = configs[j];
EGLint r, g, b, a;
if (sEGLLibrary.fGetConfigAttrib(EGL_DISPLAY(), config,
LOCAL_EGL_RED_SIZE, &r) &&
sEGLLibrary.fGetConfigAttrib(EGL_DISPLAY(), config,
LOCAL_EGL_GREEN_SIZE, &g) &&
sEGLLibrary.fGetConfigAttrib(EGL_DISPLAY(), config,
LOCAL_EGL_BLUE_SIZE, &b) &&
sEGLLibrary.fGetConfigAttrib(EGL_DISPLAY(), config,
LOCAL_EGL_ALPHA_SIZE, &a) &&
((depth == 16 && r == 5 && g == 6 && b == 5) ||
(depth == 24 && r == 8 && g == 8 && b == 8 && a == 8)))
if (!sEGLLibrary.fChooseConfig(EGL_DISPLAY(), attribs.mAttribs,
configs, ncfg, &ncfg) ||
ncfg < 1)
{
*aConfig = config;
return true;
continue;
}
for (int j = 0; j < ncfg; ++j) {
EGLConfig config = configs[j];
EGLint r, g, b, a;
if (sEGLLibrary.fGetConfigAttrib(EGL_DISPLAY(), config,
LOCAL_EGL_RED_SIZE, &r) &&
sEGLLibrary.fGetConfigAttrib(EGL_DISPLAY(), config,
LOCAL_EGL_GREEN_SIZE, &g) &&
sEGLLibrary.fGetConfigAttrib(EGL_DISPLAY(), config,
LOCAL_EGL_BLUE_SIZE, &b) &&
sEGLLibrary.fGetConfigAttrib(EGL_DISPLAY(), config,
LOCAL_EGL_ALPHA_SIZE, &a) &&
((gfxASurface::ImageFormatRGB16_565 == attribs.mFormat &&
r == 5 && g == 6 && b == 5) ||
(gfxASurface::ImageFormatARGB32 == attribs.mFormat &&
r == 8 && g == 8 && b == 8 && a == 8)))
{
*aConfig = config;
return true;
}
}
}
return false;

2
widget/android/nsScreenManagerAndroid.cpp
View File

@ -78,7 +78,7 @@ nsScreenAndroid::GetPixelDepth(PRInt32 *aPixelDepth)
{
// XXX do we need to lie here about 16bpp? Or
// should we actually check and return the right thing?
*aPixelDepth = 16;
*aPixelDepth = 24;
return NS_OK;
}

4
widget/gonk/nsWindow.cpp
View File

@ -510,7 +510,9 @@ nsScreenGonk::GetAvailRect(PRInt32 *outLeft, PRInt32 *outTop,
NS_IMETHODIMP
nsScreenGonk::GetPixelDepth(PRInt32 *aPixelDepth)
{
*aPixelDepth = gNativeWindow->getDevice()->format == GGL_PIXEL_FORMAT_RGB_565 ? 16 : 24;
// XXX do we need to lie here about 16bpp? Or
// should we actually check and return the right thing?
*aPixelDepth = 24;
return NS_OK;
}