diff options
| author | Dave Airlie <airliedfreedesktop.org> | 2004-02-12 11:52:38 +0000 |
|---|---|---|
| committer | Dave Airlie <airliedfreedesktop.org> | 2004-02-12 11:52:38 +0000 |
| commit | 7b6ceb5b124673df2d94c2fe7dd2e779629f0354 (patch) | |
| tree | f90794b9a7362d1bf4a1a7922cdc743e820a205d /src/mesa/drivers/dri/mach64/mach64_vb.c | |
| parent | da8337ed5e52741321ee5171ce0b0c43f09036c9 (diff) | |
remove vertex_stride_shift, fix up code to not need it
Diffstat (limited to 'src/mesa/drivers/dri/mach64/mach64_vb.c')
| -rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_vb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/mach64/mach64_vb.c b/src/mesa/drivers/dri/mach64/mach64_vb.c index 254dd27e06..7e23006132 100644 --- a/src/mesa/drivers/dri/mach64/mach64_vb.c +++ b/src/mesa/drivers/dri/mach64/mach64_vb.c @@ -60,7 +60,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[MACH64_MAX_SETUP]; @@ -89,7 +88,7 @@ static struct { #define GET_TEXSOURCE(n) mmesa->tmu_source[n] #define GET_VERTEX_FORMAT() mmesa->vertex_format #define GET_VERTEX_STORE() mmesa->verts -#define GET_VERTEX_STRIDE_SHIFT() mmesa->vertex_stride_shift +#define GET_VERTEX_SIZE() mmesa->vertex_size * sizeof(GLuint) #define HAVE_HW_VIEWPORT 0 #define HAVE_HW_DIVIDE 0 @@ -519,8 +518,8 @@ void mach64BuildVertices( GLcontext *ctx, GLuint newinputs ) { mach64ContextPtr mmesa = MACH64_CONTEXT( ctx ); - GLubyte *v = ((GLubyte *)mmesa->verts + (start<<mmesa->vertex_stride_shift)); - GLuint stride = 1<<mmesa->vertex_stride_shift; + GLuint stride = mmesa->vertex_size * sizeof(int); + GLubyte *v = ((GLubyte *)mmesa->verts + (start * stride)); newinputs |= mmesa->SetupNewInputs; mmesa->SetupNewInputs = 0; @@ -599,7 +598,6 @@ void mach64ChooseVertexState( GLcontext *ctx ) FLUSH_BATCH(mmesa); mmesa->vertex_format = setup_tab[ind].vertex_format; mmesa->vertex_size = setup_tab[ind].vertex_size; - mmesa->vertex_stride_shift = setup_tab[ind].vertex_stride_shift; } } |