support shorts as vertex data

1 files changed, 2 insertions, 14 deletions

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index c70a47215d..4867790951 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -131,7 +131,6 @@ struct r300_dma_region {
     int aos_offset;     /* address in GART memory */
     int aos_stride;     /* distance between elements, in dwords */
     int aos_size;       /* number of components (1-4) */
-    int aos_format;     /* format of components */
     int aos_reg;        /* VAP register assignment */
 };
 
@@ -537,18 +536,6 @@ struct r300_stencilbuffer_state {
 
 };
 
-struct r300_vap_reg_state {
-	   /* input register assigments */
-	   int i_coords;
-	   int i_normal;
-	   int i_color[2];
-	   int i_fog;
-	   int i_tex[R300_MAX_TEXTURE_UNITS];
-	   int i_attrib[_TNL_NUM_GENERIC];
-	   int i_index;
-	   int i_pointsize;
-	};
-
 /* Vertex shader state */
 
 /* Perhaps more if we store programs in vmem? */
@@ -724,6 +711,7 @@ struct r300_fragment_program {
 
 #define R300_MAX_AOS_ARRAYS		16
 
+#define AOS_FORMAT_USHORT	0
 #define AOS_FORMAT_FLOAT	1
 #define AOS_FORMAT_UBYTE	2
 #define AOS_FORMAT_FLOAT_COLOR	3
@@ -770,7 +758,7 @@ struct r300_aos_rec {
 struct r300_state {
 	struct r300_depthbuffer_state depth;
 	struct r300_texture_state texture;
-	struct r300_vap_reg_state vap_reg;
+	int sw_tcl_inputs[VERT_ATTRIB_MAX];
 	struct r300_vertex_shader_state vertex_shader;
 	struct r300_pfs_compile_state pfs_compile;
 	struct r300_dma_region aos[R300_MAX_AOS_ARRAYS];