debian/changelog | 1
debian/patches/05_fix-defaults-glxfbconfig.patch | 55 +++++++++++++++++++++
debian/patches/06_fix-sort-glxfbconfig.patch | 58 +++++++++++++++++++++++
debian/patches/series | 2
4 files changed, 116 insertions(+)
New commits:
commit 75c8abd584efb7e89cbdd21b6f4f39c3a89ad526
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Wed Feb 19 10:07:45 2014 +0100
Cherry pick some fixes for GLX fbconfig. (Closes: #739691)
Signed-off-by: Andreas Boll <andreas.boll....@gmail.com>
diff --git a/debian/changelog b/debian/changelog
index 39cfb7c..c920231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium
[ Andreas Boll ]
* Attempt to fix FTBFS on hurd.
+ * Cherry pick some fixes for GLX fbconfig. (Closes: #739691)
-- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 20 Feb 2014
19:12:12 +0100
diff --git a/debian/patches/05_fix-defaults-glxfbconfig.patch
b/debian/patches/05_fix-defaults-glxfbconfig.patch
new file mode 100644
index 0000000..5e61098
--- /dev/null
+++ b/debian/patches/05_fix-defaults-glxfbconfig.patch
@@ -0,0 +1,55 @@
+From patchwork Mon Feb 17 22:10:17 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [Mesa-dev] glx: Fix the default values for GLXFBConfig attributes
+From: =?utf-8?q?Fredrik_H=C3=B6glund?= <fred...@kde.org>
+X-Patchwork-Id: 20458
+Message-Id: <1392675017-17844-1-git-send-email-fred...@kde.org>
+To: mesa-...@lists.freedesktop.org
+Cc: "9.2 10.0 10.1" <mesa-sta...@lists.freedesktop.org>
+Date: Mon, 17 Feb 2014 23:10:17 +0100
+
+The default values for GLX_DRAWABLE_TYPE and GLX_RENDER_TYPE are
+GLX_WINDOW_BIT and GLX_RGBA_BIT respectively, as specified in
+the GLX 1.4 specification.
+
+This fixes the glx-choosefbconfig-defaults piglit test.
+
+Cc: "9.2 10.0 10.1" <mesa-sta...@lists.freedesktop.org>
+Reviewed-by: Dave Airlie <airl...@redhat.com>
+Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
+
+---
+src/glx/glxcmds.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
+index 38a5262..43c473b 100644
+--- a/src/glx/glxcmds.c
++++ b/src/glx/glxcmds.c
+@@ -925,13 +925,10 @@ init_fbconfig_for_chooser(struct glx_config * config,
+ if (fbconfig_style_tags) {
+ config->rgbMode = GL_TRUE;
+ config->doubleBufferMode = GLX_DONT_CARE;
+- /* allow any kind of drawable, including those for off-screen buffers */
+- config->drawableType = 0;
+- } else {
+- /* allow configs which support on-screen drawing */
+- config->drawableType = GLX_WINDOW_BIT;
++ config->renderType = GLX_RGBA_BIT;
+ }
+
++ config->drawableType = GLX_WINDOW_BIT;
+ config->visualRating = GLX_DONT_CARE;
+ config->transparentPixel = GLX_NONE;
+ config->transparentRed = GLX_DONT_CARE;
+@@ -940,8 +937,6 @@ init_fbconfig_for_chooser(struct glx_config * config,
+ config->transparentAlpha = GLX_DONT_CARE;
+ config->transparentIndex = GLX_DONT_CARE;
+
+- /* Set GLX_RENDER_TYPE property to not expect any flags by default. */
+- config->renderType = 0;
+ config->xRenderable = GLX_DONT_CARE;
+ config->fbconfigID = (GLXFBConfigID) (GLX_DONT_CARE);
+
diff --git a/debian/patches/06_fix-sort-glxfbconfig.patch
b/debian/patches/06_fix-sort-glxfbconfig.patch
new file mode 100644
index 0000000..c598ee2
--- /dev/null
+++ b/debian/patches/06_fix-sort-glxfbconfig.patch
@@ -0,0 +1,58 @@
+From patchwork Mon Feb 17 22:47:32 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [Mesa-dev] glx: Fix the GLXFBConfig attrib sort priorities
+From: =?utf-8?q?Fredrik_H=C3=B6glund?= <fred...@kde.org>
+X-Patchwork-Id: 20464
+Message-Id: <1392677252-18889-1-git-send-email-fred...@kde.org>
+To: mesa-...@lists.freedesktop.org
+Cc: "9.2 10.0 10.1" <mesa-sta...@lists.freedesktop.org>
+Date: Mon, 17 Feb 2014 23:47:32 +0100
+
+The sort priorites for GLX_SAMPLES and GLX_SAMPLE_BUFFERS are
+not defined in GL_ARB_multisample, but they are defined in
+the GLX 1.4 specification.
+
+Cc: "9.2 10.0 10.1" <mesa-sta...@lists.freedesktop.org>
+
+---
+src/glx/glxcmds.c | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
+index 43c473b..837d8a2 100644
+--- a/src/glx/glxcmds.c
++++ b/src/glx/glxcmds.c
+@@ -1105,7 +1105,7 @@ static int
+ fbconfig_compare(struct glx_config **a, struct glx_config **b)
+ {
+ /* The order of these comparisons must NOT change. It is defined by
+- * the GLX 1.3 spec and ARB_multisample.
++ * the GLX 1.4 specification.
+ */
+
+ PREFER_SMALLER(visualSelectGroup);
+@@ -1134,6 +1134,9 @@ fbconfig_compare(struct glx_config **a, struct
glx_config **b)
+
+ PREFER_SMALLER(numAuxBuffers);
+
++ PREFER_SMALLER(sampleBuffers);
++ PREFER_SMALLER(samples);
++
+ PREFER_LARGER_OR_ZERO(depthBits);
+ PREFER_SMALLER(stencilBits);
+
+@@ -1147,12 +1150,6 @@ fbconfig_compare(struct glx_config **a, struct
glx_config **b)
+
+ PREFER_SMALLER(visualType);
+
+- /* None of the multisample specs say where this comparison should happen,
+- * so I put it near the end.
+- */
+- PREFER_SMALLER(sampleBuffers);
+- PREFER_SMALLER(samples);
+-
+ /* None of the pbuffer or fbconfig specs say that this comparison needs
+ * to happen at all, but it seems like it should.
+ */
diff --git a/debian/patches/series b/debian/patches/series
index 327e298..dce198a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
01_hurd.diff
02_gbm_no_undefined.diff
04_osmesa_version.diff
+05_fix-defaults-glxfbconfig.patch
+06_fix-sort-glxfbconfig.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1whzpj-0001hs...@moszumanska.debian.org
