Stuff

From 25a80ca9959d843df532f4e96609e7da7e3b3d50 Mon Sep 17 00:00:00 2001From: simpson <simpson@artemis.(none)>Date: Wed, 22 Oct 2008 13:36:20 -0700Subject: [PATCH] r300: Enable SW TCL fog coords.--- src/mesa/drivers/dri/r300/r300_swtcl.c          |    2 ++ src/mesa/drivers/dri/r300/radeon_program_pair.c |    5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-)diff --git a/src/mesa/drivers/dri/r300/r300_swtcl.c b/src/mesa/drivers/dri/r300/r300_swtcl.cindex b6e7ce1..8287da5 100644--- a/src/mesa/drivers/dri/r300/r300_swtcl.c+++ b/src/mesa/drivers/dri/r300/r300_swtcl.c@@ -186,6 +186,8 @@ static void r300SetVertexFormat( GLcontext *ctx ) 	for (i = VERT_ATTRIB_TEX0; i <= VERT_ATTRIB_TEX7; i++) 		if (InputsRead & (1 << i)) 			inputs[i] = 6 + (i - VERT_ATTRIB_TEX0);+	if (InputsRead & (1 << VERT_ATTRIB_FOG))+		inputs[VERT_ATTRIB_FOG] = 14; 	 	for (i = 0, nr = 0; i < VERT_ATTRIB_MAX; i++) { 		if (InputsRead & (1 << i)) {diff --git a/src/mesa/drivers/dri/r300/radeon_program_pair.c b/src/mesa/drivers/dri/r300/radeon_program_pair.cindex 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);-- 1.5.6.4