From: Dave Airlie <airlied@linux.ie>
Date: Sun, 1 Jul 2007 08:50:14 +0000 (+1000)
Subject: Merge branch 'r300-swtcl'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f556b7f84c47d9b32d7daa3e1559c92e47305eb2;p=mesa.git

Merge branch 'r300-swtcl'
---

f556b7f84c47d9b32d7daa3e1559c92e47305eb2
diff --cc src/mesa/drivers/dri/r300/r300_context.h
index afd3dd384b5,5e07cbd88fd..6615bc79fb3
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@@ -783,9 -801,14 +788,10 @@@ struct r300_state 
  	GLuint *Elts;
  	struct r300_dma_region elt_dma;
  
- 	 DECLARE_RENDERINPUTS(render_inputs_bitset);	/* actual render inputs that R300 was configured for.
+ 	struct r300_dma_region swtcl_dma;
+ 	DECLARE_RENDERINPUTS(render_inputs_bitset);	/* actual render inputs that R300 was configured for.
  							   They are the same as tnl->render_inputs for fixed pipeline */
  
 -	struct {
 -		int transform_offset;	/* Transform matrix offset, -1 if none */
 -	} vap_param;		/* vertex processor parameter allocation - tells where to write parameters */
 -
  	struct r300_stencilbuffer_state stencil;
  
  };