diff options
Diffstat (limited to 'src/mesa/drivers/dri/i830/i830_tris.c')
| -rw-r--r-- | src/mesa/drivers/dri/i830/i830_tris.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i830/i830_tris.c b/src/mesa/drivers/dri/i830/i830_tris.c index 285287422b..e900661540 100644 --- a/src/mesa/drivers/dri/i830/i830_tris.c +++ b/src/mesa/drivers/dri/i830/i830_tris.c @@ -223,7 +223,7 @@ static struct { #define VERT_Y(_v) _v->v.y #define VERT_Z(_v) _v->v.z #define AREA_IS_CCW( a ) (a > 0) -#define GET_VERTEX(e) (imesa->verts + (e<<imesa->vertex_stride_shift)) +#define GET_VERTEX(e) (imesa->verts + (e * imesa->vertex_size * sizeof(int))) #define VERT_SET_RGBA( v, c ) \ do { \ @@ -454,7 +454,7 @@ i830_fallback_point( i830ContextPtr imesa, /**********************************************************************/ #define IND 0 -#define V(x) (i830Vertex *)(vertptr + ((x)<<vertshift)) +#define V(x) (i830Vertex *)(vertptr + ((x) * vertsize * sizeof(int))) #define RENDER_POINTS( start, count ) \ for ( ; start < count ; start++) POINT( V(ELT(start)) ); #define RENDER_LINE( v0, v1 ) LINE( V(v0), V(v1) ) @@ -465,7 +465,7 @@ i830_fallback_point( i830ContextPtr imesa, #define LOCAL_VARS \ i830ContextPtr imesa = I830_CONTEXT(ctx); \ GLubyte *vertptr = (GLubyte *)imesa->verts; \ - const GLuint vertshift = imesa->vertex_stride_shift; \ + const GLuint vertsize = imesa->vertex_size; \ const GLuint * const elt = TNL_CONTEXT(ctx)->vb.Elts; \ (void) elt; #define RESET_STIPPLE @@ -524,7 +524,6 @@ static void i830FastRenderClippedPoly( GLcontext *ctx, const GLuint *elts, GLuint vertsize = imesa->vertex_size; GLuint *vb = i830AllocDmaLow( imesa, (n-2) * 3 * 4 * vertsize ); GLubyte *vertptr = (GLubyte *)imesa->verts; - const GLuint vertshift = imesa->vertex_stride_shift; const GLuint *start = (const GLuint *)V(elts[0]); int i,j; |