Fix malloc size buf, silence signed/unsigned comparision warning
authorBrian <brian.paul@tungstengraphics.com>
Fri, 11 Jan 2008 17:10:45 +0000 (10:10 -0700)
committerBrian <brian.paul@tungstengraphics.com>
Fri, 11 Jan 2008 17:10:45 +0000 (10:10 -0700)
src/mesa/pipe/draw/draw_vbuf.c

index 3f6606de86f660653b01d563e2d85b9096a8f609..62aa6de68f32f18a72e184e9e4626b19b5f36c6e 100644 (file)
@@ -275,7 +275,7 @@ vbuf_flush_indices( struct draw_stage *stage )
    if(!vbuf->nr_indices)
       return;
    
-   assert(vbuf->vertex_ptr - vbuf->vertices == 
+   assert((uint) (vbuf->vertex_ptr - vbuf->vertices) == 
           vbuf->nr_vertices * vbuf->vertex_size / sizeof(unsigned));
 
    switch(vbuf->prim) {
@@ -405,7 +405,8 @@ struct draw_stage *draw_vbuf_stage( struct draw_context *draw,
 
    assert(render->max_indices < UNDEFINED_VERTEX_ID);
    vbuf->max_indices = render->max_indices;
-   vbuf->indices = align_malloc( vbuf->max_indices, 16 );
+   vbuf->indices
+      = align_malloc( vbuf->max_indices * sizeof(vbuf->indices[0]), 16 );
    
    vbuf->vertices = NULL;
    vbuf->vertex_ptr = vbuf->vertices;