Attachment 21798 Details for Bug 17929 – Revert two (errant) cherry-picks from gallium-0.2.

[patch] Revert two (errant) cherry-picks from gallium-0.2.

fogc-fixes.patch (text/plain), 1.88 KB, created by Corbin Simpson on 2009-01-08 02:40:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Corbin Simpson

Created: 2009-01-08 02:40:50 UTC

Size: 1.88 KB

patch

obsolete

>From 345efa136a49df856c215ee57266e4b13c9c22af Mon Sep 17 00:00:00 2001
>From: Corbin Simpson <MostAwesomeDude@gmail.com>
>Date: Thu, 8 Jan 2009 02:23:37 -0800
>Subject: [PATCH] Revert "mesa: set FRAG_BIT_FOGC bit in InputsUsed if FogOption!=GL_NONE"
>
>This reverts commit f8baad2d255c77c47dddeddcaf719e163e9556fb.
>---
> src/mesa/shader/arbprogparse.c |    3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
>diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
>index 39988b5..8ce5348 100644
>--- a/src/mesa/shader/arbprogparse.c
>+++ b/src/mesa/shader/arbprogparse.c
>@@ -3863,9 +3863,6 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
>    program->FogOption          = ap.FogOption;
>    program->UsesKill          = ap.UsesKill;
> 
>-   if (program->FogOption)
>-      program->Base.InputsRead |= FRAG_BIT_FOGC;
>-      
>    if (program->Base.Instructions)
>       _mesa_free(program->Base.Instructions);
>    program->Base.Instructions = ap.Base.Instructions;
>-- 
>1.5.6.5
>
>From 5eb86cdaf7a0860ffb3d878a19f91d0bb61b7989 Mon Sep 17 00:00:00 2001
>From: Corbin Simpson <MostAwesomeDude@gmail.com>
>Date: Thu, 8 Jan 2009 02:37:49 -0800
>Subject: [PATCH] Revert "temporarily set the FRAG_BIT_FOGC bit in InputsRead when fog is enabled"
>
>This reverts commit 19d77d6cfa384142cc6ab4d9b3db4b28cefb6f19.
>---
> src/mesa/main/texenvprogram.c |    1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
>diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
>index 6a57d50..3abe369 100644
>--- a/src/mesa/main/texenvprogram.c
>+++ b/src/mesa/main/texenvprogram.c
>@@ -1128,7 +1128,6 @@ create_new_program(GLcontext *ctx, struct state_key *key,
>        * a reduced value and not what is expected in FogOption
>        */
>       p.program->FogOption = ctx->Fog.Mode;
>-      p.program->Base.InputsRead |= FRAG_BIT_FOGC; /* XXX new */
>    } else
>       p.program->FogOption = GL_NONE;
> 
>-- 
>1.5.6.5
>

Actions: View | Splinter Review

Attachments on bug 17929: 19424 | 21798 | 21845

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.