<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210167] releases/WebKitGTK/webkit-2.14/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210167">210167</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-27 04:11:22 -0800 (Tue, 27 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/209982">r209982</a> - [GTK] GLXBadFBConfig error when creating an OpenGL context
https://bugs.webkit.org/show_bug.cgi?id=165200
Reviewed by Carlos Garcia Campos.
glXCreateContextAttribsARB causes a GLXBadFBConfig X error when it's not able to provide the
OpenGL version >= 3.2 we are requesting. Due to this, the app crashes instead of falling back to
the legacy path.
The patch modifies GLX context creation using a XErrorTrapper, so the first time a context is created
we don't crash if OpenGL >= 3.2 is not available.
If the gotten context is not valid, we fall back to whatever version glXCreateContextAttribsARB is
able to provide.
The legacy glXCreateContext is only used if the GLX_ARB_create_context extension is not available.
Covered by existent tests.
* platform/graphics/glx/GLContextGLX.cpp:
(WebCore::tryCreateGLXARBContext):
(WebCore::GLContextGLX::createWindowContext):
(WebCore::GLContextGLX::createPbufferContext):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsglxGLContextGLXcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (210166 => 210167)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-12-27 12:11:14 UTC (rev 210166)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-12-27 12:11:22 UTC (rev 210167)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-12-19 Miguel Gomez <magomez@igalia.com>
+
+ [GTK] GLXBadFBConfig error when creating an OpenGL context
+ https://bugs.webkit.org/show_bug.cgi?id=165200
+
+ Reviewed by Carlos Garcia Campos.
+
+ glXCreateContextAttribsARB causes a GLXBadFBConfig X error when it's not able to provide the
+ OpenGL version >= 3.2 we are requesting. Due to this, the app crashes instead of falling back to
+ the legacy path.
+ The patch modifies GLX context creation using a XErrorTrapper, so the first time a context is created
+ we don't crash if OpenGL >= 3.2 is not available.
+ If the gotten context is not valid, we fall back to whatever version glXCreateContextAttribsARB is
+ able to provide.
+ The legacy glXCreateContext is only used if the GLX_ARB_create_context extension is not available.
+
+ Covered by existent tests.
+
+ * platform/graphics/glx/GLContextGLX.cpp:
+ (WebCore::tryCreateGLXARBContext):
+ (WebCore::GLContextGLX::createWindowContext):
+ (WebCore::GLContextGLX::createPbufferContext):
+
</ins><span class="cx"> 2016-12-02 Miguel Gomez <magomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use an OpenGL < 3.0 compliant way to request the OpenGL version
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformgraphicsglxGLContextGLXcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp (210166 => 210167)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2016-12-27 12:11:14 UTC (rev 210166)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp 2016-12-27 12:11:22 UTC (rev 210167)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="cx"> #include "OpenGLShims.h"
</span><span class="cx"> #include "PlatformDisplayX11.h"
</span><ins>+#include "XErrorTrapper.h"
</ins><span class="cx"> #include <GL/glx.h>
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <cstdlib>
</span><span class="lines">@@ -73,6 +74,49 @@
</span><span class="cx"> return !!glXCreateContextAttribsARB;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static GLXContext createGLXARBContext(Display* display, GLXFBConfig config, GLXContext sharingContext)
+{
+ // We want to create a context with version >= 3.2 core profile, cause that ensures that the i965 driver won't
+ // use the software renderer. If that doesn't work, we will use whatever version available. Unfortunately,
+ // there's no way to know whether glXCreateContextAttribsARB can provide an OpenGL version >= 3.2 until
+ // we actually call it and check the return value. To make things more fun, if a version >= 3.2 cannot be
+ // provided, glXCreateContextAttribsARB will throw a GLXBadFBConfig X error, causing the app to crash.
+ // So, the first time a context is requested, we set a X error trap to disable crashes with GLXBadFBConfig
+ // and then check whether the return value is a context or not.
+
+ static bool canCreate320Context = false;
+ static bool canCreate320ContextInitialized = false;
+
+ static const int contextAttributes[] = {
+ GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
+ GLX_CONTEXT_MINOR_VERSION_ARB, 2,
+ 0
+ };
+
+ if (!canCreate320ContextInitialized) {
+ canCreate320ContextInitialized = true;
+
+ {
+ // Set an X error trapper that ignores errors to avoid crashing on GLXBadFBConfig. Use a scope
+ // here to limit the error trap to just this context creation call.
+ XErrorTrapper trapper(display, XErrorTrapper::Policy::Ignore);
+ GLXContext context = glXCreateContextAttribsARB(display, config, sharingContext, GL_TRUE, contextAttributes);
+ if (context) {
+ canCreate320Context = true;
+ return context;
+ }
+ }
+
+ // Creating the 3.2 context failed, so use whatever is available.
+ return glXCreateContextAttribsARB(display, config, sharingContext, GL_TRUE, nullptr);
+ }
+
+ if (canCreate320Context)
+ return glXCreateContextAttribsARB(display, config, sharingContext, GL_TRUE, contextAttributes);
+
+ return glXCreateContextAttribsARB(display, config, sharingContext, GL_TRUE, nullptr);
+}
+
</ins><span class="cx"> std::unique_ptr<GLContextGLX> GLContextGLX::createWindowContext(GLNativeWindowType window, PlatformDisplay& platformDisplay, GLXContext sharingContext)
</span><span class="cx"> {
</span><span class="cx"> Display* display = downcast<PlatformDisplayX11>(platformDisplay).native();
</span><span class="lines">@@ -99,18 +143,10 @@
</span><span class="cx"> ASSERT(config);
</span><span class="cx">
</span><span class="cx"> XUniqueGLXContext context;
</span><del>- if (hasGLXARBCreateContextExtension(display)) {
- // Request OpenGL version 3.2 and core profile, which guarantees that the i965 driver doesn't use the software renderer.
- static const int contextAttributes[] = {
- GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
- GLX_CONTEXT_MINOR_VERSION_ARB, 2,
- 0
- };
- context.reset(glXCreateContextAttribsARB(display, config, sharingContext, GL_TRUE, contextAttributes));
- }
-
- if (!context) {
- // Fallback to legacy OpenGL version.
</del><ins>+ if (hasGLXARBCreateContextExtension(display))
+ context.reset(createGLXARBContext(display, config, sharingContext));
+ else {
+ // Legacy OpenGL version.
</ins><span class="cx"> XUniquePtr<XVisualInfo> visualInfoList(glXGetVisualFromFBConfig(display, config));
</span><span class="cx"> context.reset(glXCreateContext(display, visualInfoList.get(), sharingContext, True));
</span><span class="cx"> }
</span><span class="lines">@@ -147,19 +183,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> XUniqueGLXContext context;
</span><del>-
- if (hasGLXARBCreateContextExtension(display)) {
- // Request OpenGL version 3.2 and core profile, which guarantees that the i965 driver doesn't use the software renderer.
- static const int contextAttributes[] = {
- GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
- GLX_CONTEXT_MINOR_VERSION_ARB, 2,
- 0
- };
- context.reset(glXCreateContextAttribsARB(display, configs.get()[0], sharingContext, GL_TRUE, contextAttributes));
- }
-
- if (!context) {
- // Fallback to legacy OpenGL version.
</del><ins>+ if (hasGLXARBCreateContextExtension(display))
+ context.reset(createGLXARBContext(display, configs.get()[0], sharingContext));
+ else {
+ // Legacy OpenGL version.
</ins><span class="cx"> context.reset(glXCreateNewContext(display, configs.get()[0], GLX_RGBA_TYPE, sharingContext, GL_TRUE));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>