mesa: Changes to 'debian-unstable'
debian/changelog | 9 -
debian/patches/Revert-mesa-Fix-glPopAttrib-behavior-on-GL_FRAMEBUFF.diff | 61 ----------
debian/patches/series | 1
src/mesa/main/attrib.c | 3
4 files changed, 7 insertions(+), 67 deletions(-)
New commits:
commit af9aa2bff6ccdcc5d763b42babca8e1708368fae
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 28 22:09:16 2012 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index aa34369..1b3b36f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (8.0.5-2) unstable; urgency=low
+
+ * Fix regression in 8.0.5 (spurious GL_INVALID_ENUM errors):
+ mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib().
+ Thanks to Simon Chopin for the report.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Nov 2012 22:09:14 +0100
+
mesa (8.0.5-1) unstable; urgency=low
* New upstream stable release
commit 8a18fb7abcd60d503a7618699c9576c73e5ccc9f
Author: Brian Paul <brianp@vmware.com>
Date: Mon Aug 27 21:52:07 2012 -0600
mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib()
To avoid spurious GL_INVALID_ENUM errors if the extension isn't supported.
(cherry picked from commit 1aee8803f83f7ae24d9c2150c70afff2b1ee4c2f)
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 225ac89..cc384c7 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -993,7 +993,8 @@ _mesa_PopAttrib(void)
_mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
/* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
- _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
+ if (ctx->Extensions.EXT_framebuffer_sRGB)
+ _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
}
break;
case GL_CURRENT_BIT:
commit 4505da2c25b2b830931f6d73ffc178dce653b92b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 28 22:07:40 2012 +0100
Revert "Revert a commit from 8.0.5 that was reported as causing a regression"
This reverts commit 947617c21a7eda396b6582936f1042526249a669.
diff --git a/debian/changelog b/debian/changelog
index 3e65305..aa34369 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-mesa (8.0.5-2) UNRELEASED; urgency=low
-
- * Revert a commit from 8.0.5 that was reported as causing a regression
- (thanks, Simon Chopin).
-
- -- Julien Cristau <jcristau@debian.org> Wed, 28 Nov 2012 19:21:15 +0100
-
mesa (8.0.5-1) unstable; urgency=low
* New upstream stable release
diff --git a/debian/patches/Revert-mesa-Fix-glPopAttrib-behavior-on-GL_FRAMEBUFF.diff b/debian/patches/Revert-mesa-Fix-glPopAttrib-behavior-on-GL_FRAMEBUFF.diff
deleted file mode 100644
index f3eb82d..0000000
--- a/debian/patches/Revert-mesa-Fix-glPopAttrib-behavior-on-GL_FRAMEBUFF.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From 72851f44b7be6de1fd076b507c18cca2aa863416 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Wed, 28 Nov 2012 19:20:02 +0100
-Subject: [PATCH] Revert "mesa: Fix glPopAttrib() behavior on
- GL_FRAMEBUFFER_SRGB."
-
-This reverts commit bd9f729091bbbce521d4526afd0230da2a7cf350.
-
-Breaks pioneer (git://github.com/pioneerspacesim/pioneer) on llvmpipe.
----
- src/mesa/main/attrib.c | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
-index 225ac89..ca81602 100644
---- a/src/mesa/main/attrib.c
-+++ b/src/mesa/main/attrib.c
-@@ -135,9 +135,6 @@ struct gl_enable_attrib
- /* GL_ARB_point_sprite / GL_NV_point_sprite */
- GLboolean PointSprite;
- GLboolean FragmentShaderATI;
--
-- /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
-- GLboolean sRGBEnabled;
- };
-
-
-@@ -325,9 +322,6 @@ _mesa_PushAttrib(GLbitfield mask)
- attr->VertexProgramPointSize = ctx->VertexProgram.PointSizeEnabled;
- attr->VertexProgramTwoSide = ctx->VertexProgram.TwoSideEnabled;
- save_attrib_data(&head, GL_ENABLE_BIT, attr);
--
-- /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
-- attr->sRGBEnabled = ctx->Color.sRGBEnabled;
- }
-
- if (mask & GL_EVAL_BIT) {
-@@ -623,10 +617,6 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
- enable->VertexProgramTwoSide,
- GL_VERTEX_PROGRAM_TWO_SIDE_ARB);
-
-- /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
-- TEST_AND_UPDATE(ctx->Color.sRGBEnabled, enable->sRGBEnabled,
-- GL_FRAMEBUFFER_SRGB);
--
- /* texture unit enables */
- for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
- const GLbitfield enabled = enable->Texture[i];
-@@ -991,9 +981,6 @@ _mesa_PopAttrib(void)
- _mesa_set_enable(ctx, GL_DITHER, color->DitherFlag);
- _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor);
- _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
--
-- /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
-- _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
- }
- break;
- case GL_CURRENT_BIT:
---
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 67c8f4f..5746454 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
10-hurd-configure-tweaks.diff
#11-hurd-ftbfs-again.diff
13-llvm-config-pick-a-version.diff
-Revert-mesa-Fix-glPopAttrib-behavior-on-GL_FRAMEBUFF.diff
Reply to: