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 731836 - Add preference to use Mesa LLVMpipe for software rendering - r=bjacob

Browse Source
This commit is contained in:
Andrew Quartey 2012-06-02 12:05:45 -04:00
parent d2e57920e4
commit ea5a6de0a9
10 changed files with 199 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
content/canvas/src/WebGLContext.cpp
View File

@ -379,6 +379,8 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
#endif
bool forceEnabled =
Preferences::GetBool("webgl.force-enabled", false);
bool useMesaLlvmPipe =
Preferences::GetBool("gfx.prefer-mesa-llvmpipe", false);
bool disabled =
Preferences::GetBool("webgl.disabled", false);
@ -464,7 +466,7 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
#ifdef XP_WIN
// allow forcing GL and not EGL/ANGLE
if (PR_GetEnv("MOZ_WEBGL_FORCE_OPENGL")) {
if (useMesaLlvmPipe || PR_GetEnv("MOZ_WEBGL_FORCE_OPENGL")) {
preferEGL = false;
useANGLE = false;
useOpenGL = true;
@ -528,10 +530,15 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
#endif
// try the default provider, whatever that is
if (!gl && useOpenGL) {
gl = gl::GLContextProvider::CreateOffscreen(gfxIntSize(width, height), format);
if (!gl && useOpenGL) {
GLContext::ContextFlags flag = useMesaLlvmPipe
? GLContext::ContextFlagsMesaLLVMPipe
: GLContext::ContextFlagsNone;
gl = gl::GLContextProvider::CreateOffscreen(gfxIntSize(width, height),
format, flag);
if (gl && !InitAndValidateGL()) {
GenerateWarning("Error during OpenGL initialization");
GenerateWarning("Error during %s initialization",
useMesaLlvmPipe ? "Mesa LLVMpipe" : "OpenGL");
return NS_ERROR_FAILURE;
}
}

3
gfx/gl/GLContext.h
View File

@ -554,7 +554,8 @@ public:
enum ContextFlags {
ContextFlagsNone = 0x0,
ContextFlagsGlobal = 0x1
ContextFlagsGlobal = 0x1,
ContextFlagsMesaLLVMPipe = 0x2
};
enum GLContextType {

2
gfx/gl/GLContextProviderCGL.mm
View File

@ -607,7 +607,7 @@ GLContextProviderCGL::CreateForNativePixmapSurface(gfxASurface *aSurface)
static nsRefPtr<GLContext> gGlobalContext;
GLContext *
GLContextProviderCGL::GetGlobalContext()
GLContextProviderCGL::GetGlobalContext(const ContextFlags)
{
if (!sCGLLibrary.EnsureInitialized()) {
return nsnull;

2
gfx/gl/GLContextProviderEGL.cpp
View File

@ -1947,7 +1947,7 @@ GLContextProviderEGL::CreateForNativePixmapSurface(gfxASurface* aSurface)
}
GLContext *
GLContextProviderEGL::GetGlobalContext()
GLContextProviderEGL::GetGlobalContext(const ContextFlags)
{
static bool triedToCreateContext = false;
if (!triedToCreateContext && !gGlobalContext) {

2
gfx/gl/GLContextProviderGLX.cpp
View File

@ -1355,7 +1355,7 @@ GLContextProviderGLX::CreateForNativePixmapSurface(gfxASurface *aSurface)
static nsRefPtr<GLContext> gGlobalContext;
GLContext *
GLContextProviderGLX::GetGlobalContext()
GLContextProviderGLX::GetGlobalContext(const ContextFlags)
{
static bool triedToCreateContext = false;
if (!triedToCreateContext && !gGlobalContext) {

2
gfx/gl/GLContextProviderImpl.h
View File

@ -78,7 +78,7 @@ public:
* Get a pointer to the global context, creating it if it doesn't exist.
*/
static GLContext *
GetGlobalContext();
GetGlobalContext( const ContextFlags aFlags = GLContext::ContextFlagsNone);
/**
* Free any resources held by this Context Provider.

2
gfx/gl/GLContextProviderOSMesa.cpp
View File

@ -248,7 +248,7 @@ GLContextProviderOSMesa::CreateOffscreen(const gfxIntSize& aSize,
}
GLContext *
GLContextProviderOSMesa::GetGlobalContext()
GLContextProviderOSMesa::GetGlobalContext(const ContextFlags)
{
return nsnull;
}

244
gfx/gl/GLContextProviderWGL.cpp
View File

@ -23,17 +23,20 @@
namespace mozilla {
namespace gl {
WGLLibrary sWGLLibrary;
typedef WGLLibrary::LibraryType LibType;
static HWND gSharedWindow = 0;
static HDC gSharedWindowDC = 0;
static HGLRC gSharedWindowGLContext = 0;
static int gSharedWindowPixelFormat = 0;
WGLLibrary sWGLLib[WGLLibrary::LIBS_MAX];
static bool gUseDoubleBufferedWindows = false;
LibType
WGLLibrary::SelectLibrary(const GLContext::ContextFlags& aFlags)
{
return (aFlags & GLContext::ContextFlagsMesaLLVMPipe)
? WGLLibrary::MESA_LLVMPIPE_LIB
: WGLLibrary::OPENGL_LIB;
}
static HWND
CreateDummyWindow(HDC *aWindowDC = nsnull)
HWND
WGLLibrary::CreateDummyWindow(HDC *aWindowDC)
{
WNDCLASSW wc;
if (!GetClassInfoW(GetModuleHandle(NULL), L"GLContextWGLClass", &wc)) {
@ -57,13 +60,13 @@ CreateDummyWindow(HDC *aWindowDC = nsnull)
HDC dc = GetDC(win);
NS_ENSURE_TRUE(dc, NULL);
if (gSharedWindowPixelFormat == 0) {
if (mWindowPixelFormat == 0) {
PIXELFORMATDESCRIPTOR pfd;
ZeroMemory(&pfd, sizeof(PIXELFORMATDESCRIPTOR));
pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
pfd.nVersion = 1;
pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL;
if (gUseDoubleBufferedWindows)
if (mUseDoubleBufferedWindows)
pfd.dwFlags |= PFD_DOUBLEBUFFER;
pfd.iPixelType = PFD_TYPE_RGBA;
pfd.cColorBits = 24;
@ -74,11 +77,11 @@ CreateDummyWindow(HDC *aWindowDC = nsnull)
pfd.cDepthBits = 0;
pfd.iLayerType = PFD_MAIN_PLANE;
gSharedWindowPixelFormat = ChoosePixelFormat(dc, &pfd);
mWindowPixelFormat = ChoosePixelFormat(dc, &pfd);
}
if (!gSharedWindowPixelFormat ||
!SetPixelFormat(dc, gSharedWindowPixelFormat, NULL))
if (!mWindowPixelFormat ||
!SetPixelFormat(dc, mWindowPixelFormat, NULL))
{
NS_WARNING("SetPixelFormat failed!");
DestroyWindow(win);
@ -100,22 +103,25 @@ HasExtension(const char* aExtensions, const char* aRequiredExtension)
}
bool
WGLLibrary::EnsureInitialized()
WGLLibrary::EnsureInitialized(bool aUseMesaLlvmPipe)
{
if (mInitialized)
return true;
mozilla::ScopedGfxFeatureReporter reporter("WGL", aUseMesaLlvmPipe);
mozilla::ScopedGfxFeatureReporter reporter("WGL");
const char* libGLFilename = aUseMesaLlvmPipe
? "mesallvmpipe.dll"
: "Opengl32.dll";
if (!mOGLLibrary) {
mOGLLibrary = PR_LoadLibrary("Opengl32.dll");
mOGLLibrary = PR_LoadLibrary(libGLFilename);
if (!mOGLLibrary) {
NS_WARNING("Couldn't load OpenGL DLL.");
NS_WARNING("Couldn't load OpenGL library.");
return false;
}
}
gUseDoubleBufferedWindows = PR_GetEnv("MOZ_WGL_DB") != nsnull;
mUseDoubleBufferedWindows = PR_GetEnv("MOZ_WGL_DB") != nsnull;
GLLibraryLoader::SymLoadStruct earlySymbols[] = {
{ (PRFuncPtr*) &fCreateContext, { "wglCreateContext", NULL } },
@ -135,17 +141,17 @@ WGLLibrary::EnsureInitialized()
// This is ridiculous -- we have to actually create a context to
// get the OpenGL ICD to load.
gSharedWindow = CreateDummyWindow(&gSharedWindowDC);
NS_ENSURE_TRUE(gSharedWindow, false);
mWindow = CreateDummyWindow(&mWindowDC);
NS_ENSURE_TRUE(mWindow, false);
// create rendering context
gSharedWindowGLContext = fCreateContext(gSharedWindowDC);
NS_ENSURE_TRUE(gSharedWindowGLContext, false);
mWindowGLContext = fCreateContext(mWindowDC);
NS_ENSURE_TRUE(mWindowGLContext, false);
HGLRC curCtx = fGetCurrentContext();
HDC curDC = fGetCurrentDC();
if (!fMakeCurrent((HDC)gSharedWindowDC, (HGLRC)gSharedWindowGLContext)) {
if (!fMakeCurrent((HDC)mWindowDC, (HGLRC)mWindowGLContext)) {
NS_WARNING("wglMakeCurrent failed");
return false;
}
@ -194,7 +200,7 @@ WGLLibrary::EnsureInitialized()
if (GLLibraryLoader::LoadSymbols(mOGLLibrary, &extensionsSymbols[0],
(GLLibraryLoader::PlatformLookupFunction)fGetProcAddress)) {
const char *wglExts = fGetExtensionsString(gSharedWindowDC);
const char *wglExts = fGetExtensionsString(mWindowDC);
if (wglExts && HasExtension(wglExts, "WGL_ARB_create_context")) {
GLLibraryLoader::LoadSymbols(mOGLLibrary, &robustnessSymbols[0],
(GLLibraryLoader::PlatformLookupFunction)fGetProcAddress);
@ -208,7 +214,7 @@ WGLLibrary::EnsureInitialized()
fMakeCurrent(curDC, curCtx);
if (mHasRobustness) {
fDeleteContext(gSharedWindowGLContext);
fDeleteContext(mWindowGLContext);
int attribs[] = {
LOCAL_WGL_CONTEXT_FLAGS_ARB, LOCAL_WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB,
@ -216,19 +222,25 @@ WGLLibrary::EnsureInitialized()
NULL
};
gSharedWindowGLContext = fCreateContextAttribs(gSharedWindowDC, NULL, attribs);
if (!gSharedWindowGLContext) {
mWindowGLContext = fCreateContextAttribs(mWindowDC, NULL, attribs);
if (!mWindowGLContext) {
mHasRobustness = false;
gSharedWindowGLContext = fCreateContext(gSharedWindowDC);
mWindowGLContext = fCreateContext(mWindowDC);
}
}
mInitialized = true;
GLContext::ContextFlags flag = GLContext::ContextFlagsNone;
if (aUseMesaLlvmPipe) {
mLibType = WGLLibrary::MESA_LLVMPIPE_LIB;
flag = GLContext::ContextFlagsMesaLLVMPipe;
}
// Call this to create the global GLContext instance,
// and to check for errors. Note that this must happen /after/
// setting mInitialized to TRUE, or an infinite loop results.
if (GLContextProviderWGL::GetGlobalContext() == nsnull) {
if (GLContextProviderWGL::GetGlobalContext(flag) == nsnull) {
mInitialized = false;
return false;
}
@ -244,6 +256,7 @@ public:
GLContext *aSharedContext,
HDC aDC,
HGLRC aContext,
LibType aLibUsed,
HWND aWindow = nsnull,
bool aIsOffscreen = false)
: GLContext(aFormat, aIsOffscreen, aSharedContext),
@ -252,6 +265,7 @@ public:
mWnd(aWindow),
mPBuffer(NULL),
mPixelFormat(0),
mLibType(aLibUsed),
mIsDoubleBuffered(false)
{
}
@ -261,13 +275,15 @@ public:
HANDLE aPbuffer,
HDC aDC,
HGLRC aContext,
int aPixelFormat)
int aPixelFormat,
LibType aLibUsed)
: GLContext(aFormat, true, aSharedContext),
mDC(aDC),
mContext(aContext),
mWnd(NULL),
mPBuffer(aPbuffer),
mPixelFormat(aPixelFormat),
mLibType(aLibUsed),
mIsDoubleBuffered(false)
{
}
@ -276,10 +292,10 @@ public:
{
MarkDestroyed();
sWGLLibrary.fDeleteContext(mContext);
sWGLLib[mLibType].fDeleteContext(mContext);
if (mPBuffer)
sWGLLibrary.fDestroyPbuffer(mPBuffer);
sWGLLib[mLibType].fDestroyPbuffer(mPBuffer);
if (mWnd)
DestroyWindow(mWnd);
}
@ -310,8 +326,8 @@ public:
// of its TLS slot, so no need to do our own tls slot.
// You would think that wglMakeCurrent would avoid doing
// work if mContext was already current, but not so much..
if (aForce || sWGLLibrary.fGetCurrentContext() != mContext) {
succeeded = sWGLLibrary.fMakeCurrent(mDC, mContext);
if (aForce || sWGLLib[mLibType].fGetCurrentContext() != mContext) {
succeeded = sWGLLib[mLibType].fMakeCurrent(mDC, mContext);
NS_ASSERTION(succeeded, "Failed to make GL context current!");
}
@ -328,7 +344,7 @@ public:
bool SupportsRobustness()
{
return sWGLLibrary.HasRobustness();
return sWGLLib[mLibType].HasRobustness();
}
virtual bool SwapBuffers() {
@ -339,7 +355,7 @@ public:
bool SetupLookupFunction()
{
mLookupFunc = (PlatformLookupFunction)sWGLLibrary.fGetProcAddress;
mLookupFunc = (PlatformLookupFunction)sWGLLib[mLibType].fGetProcAddress;
return true;
}
@ -368,7 +384,7 @@ protected:
HWND mWnd;
HANDLE mPBuffer;
int mPixelFormat;
LibType mLibType;
bool mIsDoubleBuffered;
};
@ -388,14 +404,19 @@ GLContextWGL::BindTex2DOffscreen(GLContext *aOffscreen)
GLContextWGL *offs = static_cast<GLContextWGL*>(aOffscreen);
if (offs->mPBuffer) {
BOOL ok = sWGLLibrary.fBindTexImage(offs->mPBuffer,
BOOL ok = sWGLLib[mLibType].fBindTexImage(offs->mPBuffer,
LOCAL_WGL_FRONT_LEFT_ARB);
if (!ok) {
NS_WARNING("CanvasLayerOGL::Updated wglBindTexImageARB failed");
return false;
}
} else if (offs->mOffscreenTexture) {
if (offs->GetSharedContext() != GLContextProviderWGL::GetGlobalContext())
GLContext::ContextFlags flag =
sWGLLib[mLibType].GetLibraryType() == WGLLibrary::MESA_LLVMPIPE_LIB
? GLContext::ContextFlagsMesaLLVMPipe
: GLContext::ContextFlagsNone;
if (offs->GetSharedContext() != GLContextProviderWGL::GetGlobalContext(flag))
{
NS_WARNING("offscreen FBO context can only be bound with context sharing!");
return false;
@ -420,19 +441,19 @@ GLContextWGL::UnbindTex2DOffscreen(GLContext *aOffscreen)
// XXX so, according to the extension, ReleaseTexImage is not required to
// preserve color buffer contents. This sucks, but everywhere that I've
// tried it the color buffer is preserved. So let's cross our fingers..
sWGLLibrary.fReleaseTexImage(offs->mPBuffer, LOCAL_WGL_FRONT_LEFT_ARB);
sWGLLib[mLibType].fReleaseTexImage(offs->mPBuffer, LOCAL_WGL_FRONT_LEFT_ARB);
}
}
static bool
GetMaxSize(HDC hDC, int format, gfxIntSize& size)
GetMaxSize(HDC hDC, int format, gfxIntSize& size, LibType aLibToUse)
{
int query[] = {LOCAL_WGL_MAX_PBUFFER_WIDTH_ARB, LOCAL_WGL_MAX_PBUFFER_HEIGHT_ARB};
int result[2];
// (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues)
if (!sWGLLibrary.fGetPixelFormatAttribiv(hDC, format, 0, 2, query, result))
if (!sWGLLib[aLibToUse].fGetPixelFormatAttribiv(hDC, format, 0, 2, query, result))
return false;
size.width = result[0];
@ -441,10 +462,12 @@ GetMaxSize(HDC hDC, int format, gfxIntSize& size)
}
static bool
IsValidSizeForFormat(HDC hDC, int format, const gfxIntSize& requested)
IsValidSizeForFormat(HDC hDC, int format,
const gfxIntSize& requested,
LibType aLibUsed)
{
gfxIntSize max;
if (!GetMaxSize(hDC, format, max))
if (!GetMaxSize(hDC, format, max, aLibUsed))
return true;
if (requested.width > max.width)
@ -459,7 +482,7 @@ bool
GLContextWGL::ResizeOffscreen(const gfxIntSize& aNewSize)
{
if (mPBuffer) {
if (!IsValidSizeForFormat(gSharedWindowDC, mPixelFormat, aNewSize))
if (!IsValidSizeForFormat(sWGLLib[mLibType].GetWindowDC(), mPixelFormat, aNewSize, mLibType))
return false;
int pbattrs[] = {
@ -470,22 +493,22 @@ GLContextWGL::ResizeOffscreen(const gfxIntSize& aNewSize)
0
};
HANDLE newbuf = sWGLLibrary.fCreatePbuffer(gSharedWindowDC, mPixelFormat,
HANDLE newbuf = sWGLLib[mLibType].fCreatePbuffer(sWGLLib[mLibType].GetWindowDC(), mPixelFormat,
aNewSize.width, aNewSize.height,
pbattrs);
if (!newbuf)
return false;
bool isCurrent = false;
if (sWGLLibrary.fGetCurrentContext() == mContext) {
sWGLLibrary.fMakeCurrent(NULL, NULL);
if (sWGLLib[mLibType].fGetCurrentContext() == mContext) {
sWGLLib[mLibType].fMakeCurrent(NULL, NULL);
isCurrent = true;
}
sWGLLibrary.fDestroyPbuffer(mPBuffer);
sWGLLib[mLibType].fDestroyPbuffer(mPBuffer);
mPBuffer = newbuf;
mDC = sWGLLibrary.fGetPbufferDC(mPBuffer);
mDC = sWGLLib[mLibType].fGetPbufferDC(mPBuffer);
mOffscreenSize = aNewSize;
mOffscreenActualSize = aNewSize;
@ -500,15 +523,17 @@ GLContextWGL::ResizeOffscreen(const gfxIntSize& aNewSize)
}
static GLContextWGL *
GetGlobalContextWGL()
GetGlobalContextWGL(const GLContext::ContextFlags aFlags = GLContext::ContextFlagsNone)
{
return static_cast<GLContextWGL*>(GLContextProviderWGL::GetGlobalContext());
return static_cast<GLContextWGL*>(GLContextProviderWGL::GetGlobalContext(aFlags));
}
already_AddRefed<GLContext>
GLContextProviderWGL::CreateForWindow(nsIWidget *aWidget)
{
if (!sWGLLibrary.EnsureInitialized()) {
LibType libToUse = WGLLibrary::OPENGL_LIB;
if (!sWGLLib[libToUse].EnsureInitialized(false)) {
return nsnull;
}
@ -520,37 +545,37 @@ GLContextProviderWGL::CreateForWindow(nsIWidget *aWidget)
HDC dc = (HDC)aWidget->GetNativeData(NS_NATIVE_GRAPHIC);
SetPixelFormat(dc, gSharedWindowPixelFormat, NULL);
SetPixelFormat(dc, sWGLLib[libToUse].GetWindowPixelFormat(), NULL);
HGLRC context;
GLContextWGL *shareContext = GetGlobalContextWGL();
if (sWGLLibrary.HasRobustness()) {
if (sWGLLib[libToUse].HasRobustness()) {
int attribs[] = {
LOCAL_WGL_CONTEXT_FLAGS_ARB, LOCAL_WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB,
LOCAL_WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, LOCAL_WGL_LOSE_CONTEXT_ON_RESET_ARB,
NULL
};
context = sWGLLibrary.fCreateContextAttribs(dc,
context = sWGLLib[libToUse].fCreateContextAttribs(dc,
shareContext ? shareContext->Context() : nsnull,
attribs);
if (!context && shareContext) {
context = sWGLLibrary.fCreateContextAttribs(dc, nsnull, attribs);
context = sWGLLib[libToUse].fCreateContextAttribs(dc, nsnull, attribs);
if (context) {
shareContext = nsnull;
}
} else {
context = sWGLLibrary.fCreateContext(dc);
if (context && shareContext && !sWGLLibrary.fShareLists(shareContext->Context(), context)) {
context = sWGLLib[libToUse].fCreateContext(dc);
if (context && shareContext && !sWGLLib[libToUse].fShareLists(shareContext->Context(), context)) {
shareContext = nsnull;
}
}
} else {
context = sWGLLibrary.fCreateContext(dc);
context = sWGLLib[libToUse].fCreateContext(dc);
if (context &&
shareContext &&
!sWGLLibrary.fShareLists(shareContext->Context(), context))
!sWGLLib[libToUse].fShareLists(shareContext->Context(), context))
{
shareContext = nsnull;
}
@ -561,19 +586,20 @@ GLContextProviderWGL::CreateForWindow(nsIWidget *aWidget)
}
nsRefPtr<GLContextWGL> glContext = new GLContextWGL(ContextFormat(ContextFormat::BasicRGB24),
shareContext, dc, context);
shareContext, dc, context, libToUse);
if (!glContext->Init()) {
return nsnull;
}
glContext->SetIsDoubleBuffered(gUseDoubleBufferedWindows);
glContext->SetIsDoubleBuffered(sWGLLib[libToUse].UseDoubleBufferedWindows());
return glContext.forget();
}
static already_AddRefed<GLContextWGL>
CreatePBufferOffscreenContext(const gfxIntSize& aSize,
const ContextFormat& aFormat)
const ContextFormat& aFormat,
LibType aLibToUse)
{
#define A1(_a,_x) do { _a.AppendElement(_x); } while(0)
#define A2(_a,_x,_y) do { _a.AppendElement(_x); _a.AppendElement(_y); } while(0)
@ -619,7 +645,7 @@ CreatePBufferOffscreenContext(const gfxIntSize& aSize,
UINT numFormats = 256;
int formats[256];
if (!sWGLLibrary.fChoosePixelFormat(gSharedWindowDC,
if (!sWGLLib[aLibToUse].fChoosePixelFormat(sWGLLib[aLibToUse].GetWindowDC(),
attrs.Elements(), NULL,
numFormats, formats, &numFormats)
|| numFormats == 0)
@ -630,34 +656,34 @@ CreatePBufferOffscreenContext(const gfxIntSize& aSize,
// XXX add back the priority choosing code here
int chosenFormat = formats[0];
if (!IsValidSizeForFormat(gSharedWindowDC, chosenFormat, aSize))
if (!IsValidSizeForFormat(sWGLLib[aLibToUse].GetWindowDC(), chosenFormat, aSize, aLibToUse))
return nsnull;
HANDLE pbuffer = sWGLLibrary.fCreatePbuffer(gSharedWindowDC, chosenFormat,
HANDLE pbuffer = sWGLLib[aLibToUse].fCreatePbuffer(sWGLLib[aLibToUse].GetWindowDC(), chosenFormat,
aSize.width, aSize.height,
pbattrs.Elements());
if (!pbuffer) {
return nsnull;
}
HDC pbdc = sWGLLibrary.fGetPbufferDC(pbuffer);
HDC pbdc = sWGLLib[aLibToUse].fGetPbufferDC(pbuffer);
NS_ASSERTION(pbdc, "expected a dc");
HGLRC context;
if (sWGLLibrary.HasRobustness()) {
if (sWGLLib[aLibToUse].HasRobustness()) {
int attribs[] = {
LOCAL_WGL_CONTEXT_FLAGS_ARB, LOCAL_WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB,
LOCAL_WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, LOCAL_WGL_LOSE_CONTEXT_ON_RESET_ARB,
NULL
};
context = sWGLLibrary.fCreateContextAttribs(pbdc, nsnull, attribs);
context = sWGLLib[aLibToUse].fCreateContextAttribs(pbdc, nsnull, attribs);
} else {
context = sWGLLibrary.fCreateContext(pbdc);
context = sWGLLib[aLibToUse].fCreateContext(pbdc);
}
if (!context) {
sWGLLibrary.fDestroyPbuffer(pbuffer);
sWGLLib[aLibToUse].fDestroyPbuffer(pbuffer);
return false;
}
@ -666,43 +692,46 @@ CreatePBufferOffscreenContext(const gfxIntSize& aSize,
pbuffer,
pbdc,
context,
chosenFormat);
chosenFormat,
aLibToUse);
return glContext.forget();
}
static already_AddRefed<GLContextWGL>
CreateWindowOffscreenContext(const ContextFormat& aFormat)
CreateWindowOffscreenContext(const ContextFormat& aFormat,
const GLContext::ContextFlags aFlags)
{
// CreateWindowOffscreenContext must return a global-shared context
GLContextWGL *shareContext = GetGlobalContextWGL();
GLContextWGL *shareContext = GetGlobalContextWGL(aFlags);
if (!shareContext) {
return nsnull;
}
LibType libToUse = WGLLibrary::SelectLibrary(aFlags);
HDC dc;
HWND win = CreateDummyWindow(&dc);
HWND win = sWGLLib[libToUse].CreateDummyWindow(&dc);
if (!win) {
return nsnull;
}
HGLRC context = sWGLLibrary.fCreateContext(dc);
if (sWGLLibrary.HasRobustness()) {
HGLRC context = sWGLLib[libToUse].fCreateContext(dc);
if (sWGLLib[libToUse].HasRobustness()) {
int attribs[] = {
LOCAL_WGL_CONTEXT_FLAGS_ARB, LOCAL_WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB,
LOCAL_WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, LOCAL_WGL_LOSE_CONTEXT_ON_RESET_ARB,
NULL
};
context = sWGLLibrary.fCreateContextAttribs(dc, shareContext->Context(), attribs);
context = sWGLLib[libToUse].fCreateContextAttribs(dc, shareContext->Context(), attribs);
} else {
context = sWGLLibrary.fCreateContext(dc);
context = sWGLLib[libToUse].fCreateContext(dc);
if (context && shareContext &&
!sWGLLibrary.fShareLists(shareContext->Context(), context))
!sWGLLib[libToUse].fShareLists(shareContext->Context(), context))
{
NS_WARNING("wglShareLists failed!");
sWGLLibrary.fDeleteContext(context);
sWGLLib[libToUse].fDeleteContext(context);
DestroyWindow(win);
return nsnull;
}
@ -713,7 +742,8 @@ CreateWindowOffscreenContext(const ContextFormat& aFormat)
}
nsRefPtr<GLContextWGL> glContext = new GLContextWGL(aFormat, shareContext,
dc, context, win, true);
dc, context, libToUse,
win, true);
return glContext.forget();
}
@ -721,9 +751,11 @@ CreateWindowOffscreenContext(const ContextFormat& aFormat)
already_AddRefed<GLContext>
GLContextProviderWGL::CreateOffscreen(const gfxIntSize& aSize,
const ContextFormat& aFormat,
const ContextFlags)
const ContextFlags aFlags)
{
if (!sWGLLibrary.EnsureInitialized()) {
LibType libToUse = WGLLibrary::SelectLibrary(aFlags);
if (!sWGLLib[libToUse].EnsureInitialized(libToUse == WGLLibrary::MESA_LLVMPIPE_LIB)) {
return nsnull;
}
@ -734,15 +766,15 @@ GLContextProviderWGL::CreateOffscreen(const gfxIntSize& aSize,
NS_ENSURE_TRUE(Preferences::GetRootBranch(), nsnull);
const bool preferFBOs = Preferences::GetBool("wgl.prefer-fbo", false);
if (!preferFBOs &&
sWGLLibrary.fCreatePbuffer &&
sWGLLibrary.fChoosePixelFormat)
sWGLLib[libToUse].fCreatePbuffer &&
sWGLLib[libToUse].fChoosePixelFormat)
{
glContext = CreatePBufferOffscreenContext(aSize, aFormat);
glContext = CreatePBufferOffscreenContext(aSize, aFormat,libToUse);
}
// If it failed, then create a window context and use a FBO.
if (!glContext) {
glContext = CreateWindowOffscreenContext(aFormat);
glContext = CreateWindowOffscreenContext(aFormat, aFlags);
}
if (!glContext ||
@ -766,39 +798,45 @@ GLContextProviderWGL::CreateForNativePixmapSurface(gfxASurface *aSurface)
return nsnull;
}
static nsRefPtr<GLContextWGL> gGlobalContext;
static nsRefPtr<GLContextWGL> gGlobalContext[WGLLibrary::LIBS_MAX];
GLContext *
GLContextProviderWGL::GetGlobalContext()
GLContextProviderWGL::GetGlobalContext(const ContextFlags aFlags)
{
if (!sWGLLibrary.EnsureInitialized()) {
LibType libToUse = WGLLibrary::SelectLibrary(aFlags);
if (!sWGLLib[libToUse].EnsureInitialized(libToUse == WGLLibrary::MESA_LLVMPIPE_LIB)) {
return nsnull;
}
static bool triedToCreateContext = false;
static bool triedToCreateContext[WGLLibrary::LIBS_MAX] = {false, false};
if (!triedToCreateContext && !gGlobalContext) {
triedToCreateContext = true;
if (!triedToCreateContext[libToUse] && !gGlobalContext[libToUse]) {
triedToCreateContext[libToUse] = true;
// conveniently, we already have what we need...
gGlobalContext = new GLContextWGL(ContextFormat(ContextFormat::BasicRGB24), nsnull,
gSharedWindowDC, gSharedWindowGLContext);
if (!gGlobalContext->Init()) {
gGlobalContext[libToUse] = new GLContextWGL(ContextFormat(ContextFormat::BasicRGB24),
nsnull,
sWGLLib[libToUse].GetWindowDC(),
sWGLLib[libToUse].GetWindowGLContext(),
libToUse);
if (!gGlobalContext[libToUse]->Init()) {
NS_WARNING("Global context GLContext initialization failed?");
gGlobalContext = nsnull;
gGlobalContext[libToUse] = nsnull;
return false;
}
gGlobalContext->SetIsGlobalSharedContext(true);
gGlobalContext[libToUse]->SetIsGlobalSharedContext(true);
}
return static_cast<GLContext*>(gGlobalContext);
return static_cast<GLContext*>(gGlobalContext[libToUse]);
}
void
GLContextProviderWGL::Shutdown()
{
gGlobalContext = nsnull;
for (int i = 0; i < WGLLibrary::LIBS_MAX; ++i)
gGlobalContext[i] = nsnull;
}
} /* namespace gl */

45
gfx/gl/WGLLibrary.h
View File

@ -11,8 +11,24 @@ namespace gl {
class WGLLibrary
{
public:
WGLLibrary() : mInitialized(false), mOGLLibrary(nsnull),
mHasRobustness(false) {}
WGLLibrary()
: mInitialized(false),
mOGLLibrary(nsnull),
mHasRobustness(false),
mWindow (0),
mWindowDC(0),
mWindowGLContext(0),
mWindowPixelFormat (0),
mUseDoubleBufferedWindows(false),
mLibType(OPENGL_LIB)
{}
enum LibraryType
{
OPENGL_LIB = 0,
MESA_LLVMPIPE_LIB = 1,
LIBS_MAX
};
typedef HGLRC (GLAPIENTRY * PFNWGLCREATECONTEXTPROC) (HDC);
PFNWGLCREATECONTEXTPROC fCreateContext;
@ -52,18 +68,35 @@ public:
typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSPROC) (HDC hdc, HGLRC hShareContext, const int *attribList);
PFNWGLCREATECONTEXTATTRIBSPROC fCreateContextAttribs;
bool EnsureInitialized();
bool HasRobustness() const { return mHasRobustness; }
bool EnsureInitialized(bool aUseMesaLlvmPipe);
HWND CreateDummyWindow(HDC *aWindowDC = nsnull);
bool HasRobustness() const { return mHasRobustness; }
bool IsInitialized() const { return mInitialized; }
HWND GetWindow() const { return mWindow; }
HDC GetWindowDC() const {return mWindowDC; }
HGLRC GetWindowGLContext() const {return mWindowGLContext; }
int GetWindowPixelFormat() const { return mWindowPixelFormat; }
bool UseDoubleBufferedWindows() const { return mUseDoubleBufferedWindows; }
LibraryType GetLibraryType() const { return mLibType; }
static LibraryType SelectLibrary(const GLContext::ContextFlags& aFlags);
private:
bool mInitialized;
PRLibrary *mOGLLibrary;
bool mHasRobustness;
HWND mWindow;
HDC mWindowDC;
HGLRC mWindowGLContext;
int mWindowPixelFormat;
bool mUseDoubleBufferedWindows;
LibraryType mLibType;
};
// a global WGLLibrary instance
extern WGLLibrary sWGLLibrary;
extern WGLLibrary sWGLLibrary[WGLLibrary::LIBS_MAX];
} /* namespace gl */
} /* namespace mozilla */

1
modules/libpref/src/init/all.js
View File

@ -237,6 +237,7 @@ pref("gfx.textures.poweroftwo.force-enabled", false);
#endif
pref("gfx.work-around-driver-bugs", true);
pref("gfx.prefer-mesa-llvmpipe", false);
pref("accessibility.browsewithcaret", false);
pref("accessibility.warn_on_browsewithcaret", true);