debian/changelog | 7 + debian/patches/Revert-mesa-Fix-glPopAttrib-behavior-on-GL_FRAMEBUFF.diff | 61 ++++++++++ debian/patches/series | 1 3 files changed, 69 insertions(+)
New commits: commit 947617c21a7eda396b6582936f1042526249a669 Author: Julien Cristau <[email protected]> Date: Wed Nov 28 19:22:18 2012 +0100 Revert a commit from 8.0.5 that was reported as causing a regression Thanks, Simon Chopin! diff --git a/debian/changelog b/debian/changelog index aa34369..3e65305 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 <[email protected]> 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 new file mode 100644 index 0000000..f3eb82d --- /dev/null +++ b/debian/patches/Revert-mesa-Fix-glPopAttrib-behavior-on-GL_FRAMEBUFF.diff @@ -0,0 +1,61 @@ +From 72851f44b7be6de1fd076b507c18cca2aa863416 Mon Sep 17 00:00:00 2001 +From: Julien Cristau <[email protected]> +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 5746454..67c8f4f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 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 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
