Merge branch 'r300-swtcl'

diff --cc src/mesa/drivers/dri/r300/r300_context.h
index afd3dd384b5908040262433b48492b61481a37a2,5e07cbd88fd24cdf0a61d1775fe817ddacb43108..6615bc79fb3edc10153d12a37665dea909c12a0d
--- 1/src/mesa/drivers/dri/r300/r300_context.h
--- 2/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;
  
  };

diff --cc src/mesa/drivers/dri/r300/r300_state.c
Simple merge