1 files changed, 3 insertions, 21 deletions

diff --git a/src/mesa/drivers/dri/sis/sis_vb.c b/src/mesa/drivers/dri/sis/sis_vb.c
index 620c1d6f10..acff4601e9 100644
--- a/src/mesa/drivers/dri/sis/sis_vb.c
+++ b/src/mesa/drivers/dri/sis/sis_vb.c
@@ -59,7 +59,6 @@ static struct {
    copy_pv_func	        copy_pv;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_size;
-   GLuint               vertex_stride_shift;
    GLuint               vertex_format;
 } setup_tab[SIS_MAX_SETUP];
 
@@ -90,9 +89,7 @@ static struct {
 #define GET_TEXSOURCE(n)  n
 #define GET_VERTEX_FORMAT() smesa->vertex_format
 #define GET_VERTEX_STORE() smesa->verts
-#define GET_VERTEX_STRIDE_SHIFT() smesa->vertex_stride_shift
-#define GET_UBYTE_COLOR_STORE() &smesa->UbyteColor
-#define GET_UBYTE_SPEC_COLOR_STORE() &smesa->UbyteSecondaryColor
+#define GET_VERTEX_SIZE() smesa->vertex_size * sizeof(GLuint)
 
 #define HAVE_HW_VIEWPORT    0
 #define HAVE_HW_DIVIDE      0
@@ -112,9 +109,6 @@ static struct {
 
 #define PTEX_FALLBACK() FALLBACK(smesa, SIS_FALLBACK_TEXTURE, 1)
 
-#define IMPORT_FLOAT_COLORS sis_import_float_colors
-#define IMPORT_FLOAT_SPEC_COLORS sis_import_float_spec_colors
-
 #define INTERP_VERTEX setup_tab[smesa->SetupIndex].interp
 #define COPY_PV_VERTEX setup_tab[smesa->SetupIndex].copy_pv
 
@@ -351,8 +345,8 @@ void sisBuildVertices( GLcontext *ctx,
 		       GLuint newinputs )
 {
    sisContextPtr smesa = SIS_CONTEXT( ctx );
-   GLubyte *v = ((GLubyte *)smesa->verts + (start<<smesa->vertex_stride_shift));
-   GLuint stride = 1 << smesa->vertex_stride_shift;
+   GLuint stride = smesa->vertex_size * sizeof(int);
+   GLubyte *v = ((GLubyte *)smesa->verts + (start * stride));
 
    newinputs |= smesa->SetupNewInputs;
    smesa->SetupNewInputs = 0;
@@ -423,7 +417,6 @@ void sisChooseVertexState( GLcontext *ctx )
   if (setup_tab[ind].vertex_format != smesa->vertex_format) {
     smesa->vertex_format = setup_tab[ind].vertex_format;
     smesa->vertex_size = setup_tab[ind].vertex_size;
-    smesa->vertex_stride_shift = setup_tab[ind].vertex_stride_shift;
   }
 }
 
@@ -449,15 +442,4 @@ void sisFreeVB( GLcontext *ctx )
     ALIGN_FREE(smesa->verts);
     smesa->verts = NULL;
   }
-
-
-  if (smesa->UbyteSecondaryColor.Ptr) {
-    ALIGN_FREE(smesa->UbyteSecondaryColor.Ptr);
-    smesa->UbyteSecondaryColor.Ptr = NULL;
-  }
-
-  if (smesa->UbyteColor.Ptr) {
-    ALIGN_FREE(smesa->UbyteColor.Ptr);
-    smesa->UbyteColor.Ptr = NULL;
-  }
 }