Attachment 21845 Details for Bug 17929 – silence fog warnings/errors in r300 driver (untested)

[patch] silence fog warnings/errors in r300 driver (untested)

r300-fog-workaround.patch (text/plain), 1.24 KB, created by Brian Paul on 2009-01-09 14:46:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2009-01-09 14:46:08 UTC

Size: 1.24 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
>index 6a5c363..a63dbac 100644
>--- a/src/mesa/drivers/dri/r300/r300_state.c
>+++ b/src/mesa/drivers/dri/r300/r300_state.c
>@@ -1675,6 +1675,13 @@ static void r300SetupRSUnit(GLcontext * ctx)
> 		rs_col_count += count;
> 	}
> 
>+	if (InputsRead & FRAG_BIT_FOGC) {
>+		/* XXX FIX THIS
>+		 * Just turn off the bit for now.
>+		 * Need to do something similar to the color/texcoord inputs.
>+		 */
>+		InputsRead &= ~FRAG_BIT_FOGC;
>+	}
> 
> 	for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
> 		int swiz;
>diff --git a/src/mesa/drivers/dri/r300/radeon_program_pair.c b/src/mesa/drivers/dri/r300/radeon_program_pair.c
>index 5ad50d2..58bc0d5 100644
>--- a/src/mesa/drivers/dri/r300/radeon_program_pair.c
>+++ b/src/mesa/drivers/dri/r300/radeon_program_pair.c
>@@ -473,6 +473,11 @@ static void allocate_input_registers(struct pair_state *s)
> 		alloc_hw_reg(s, PROGRAM_INPUT, FRAG_ATTRIB_COL1, hwindex++);
> 	InputsRead &= ~FRAG_BIT_COL1;
> 
>+	/* Fog coordinate */
>+	if (InputsRead & FRAG_BIT_FOGC)
>+		alloc_hw_reg(s, PROGRAM_INPUT, FRAG_ATTRIB_FOGC, hwindex++);
>+	InputsRead &= ~FRAG_BIT_FOGC;
>+
> 	/* Anything else */
> 	if (InputsRead)
> 		error("Don't know how to handle inputs 0x%x\n", InputsRead);

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.