Merge branch 'r300-swtcl'

[mesa.git] / src / mesa / drivers / dri / r300 / r300_context.h

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 5e07cbd88fd24cdf0a61d1775fe817ddacb43108..6615bc79fb3edc10153d12a37665dea909c12a0d 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -583,19 +583,6 @@ struct r300_vertex_shader_fragment {
 
 struct r300_vertex_shader_state {
        struct r300_vertex_shader_fragment program;
-
-       struct r300_vertex_shader_fragment unknown1;
-       struct r300_vertex_shader_fragment unknown2;
-
-       int program_start;
-       int unknown_ptr1;       /* pointer within program space */
-       int program_end;
-
-       int param_offset;
-       int param_count;
-
-       int unknown_ptr2;       /* pointer within program space */
-       int unknown_ptr3;       /* pointer within program space */
 };
 
 extern int hw_tcl_on;
@@ -805,10 +792,6 @@ struct r300_state {
        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;
 
 };