corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1650583 [Linux/EGL] Use GLContextEGL::FindVisual() in nsWindow::Create to set visual for GdkWindow, r=jhorak

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D87637
This commit is contained in:
Martin Stransky
2020-09-02 19:45:37 +00:00
parent dc4c3b82f6
commit 3c49292468
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
widget/gtk/nsWindow.cpp
View File

@@ -121,7 +121,9 @@ using namespace mozilla::widget;
#include "mozilla/layers/IAPZCTreeManager.h"
#ifdef MOZ_X11
# include "mozilla/gfx/gfxVars.h"
# include "GLContextGLX.h" // for GLContextGLX::FindVisual()
# include "GLContextEGL.h" // for GLContextEGL::FindVisual()
# include "GtkCompositorWidget.h"
# include "gfxXlibSurface.h"
# include "WindowSurfaceX11Image.h"
@@ -144,6 +146,7 @@ using namespace mozilla;
using namespace mozilla::gfx;
using namespace mozilla::widget;
using namespace mozilla::layers;
using mozilla::gl::GLContextEGL;
using mozilla::gl::GLContextGLX;
// Don't put more than this many rects in the dirty region, just fluff
@@ -4327,17 +4330,25 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
// Use GL/WebRender compatible visual only when it is necessary, since
// the visual consumes more memory.
if (mIsX11Display && mIsAccelerated) {
auto display = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(mShell));
auto screen = gtk_widget_get_screen(mShell);
int screenNumber = GDK_SCREEN_XNUMBER(screen);
int visualId = 0;
if (useWebRender) {
// WebRender rquests AlphaVisual for making readback to work
// correctly.
needsAlphaVisual = true;
}
if (GLContextGLX::FindVisual(display, screenNumber, useWebRender,
needsAlphaVisual, &visualId)) {
auto screen = gtk_widget_get_screen(mShell);
int visualId = 0;
bool haveVisual;
if (!gfx::gfxVars::UseEGL()) {
auto display = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(mShell));
int screenNumber = GDK_SCREEN_XNUMBER(screen);
haveVisual = GLContextGLX::FindVisual(
display, screenNumber, useWebRender, needsAlphaVisual, &visualId);
} else {
haveVisual = GLContextEGL::FindVisual(useWebRender, needsAlphaVisual,
&visualId);
}
if (haveVisual) {
// If we're using CSD, rendering will go through mContainer, but
// it will inherit this visual as it is a child of mShell.
gtk_widget_set_visual(mShell,