fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

new casts

Browse source
This commit is contained in:
Brian Paul 2002-04-19 00:45:50 +00:00
parent 6c5b7029b3
commit 7322cccfb9
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/tnl/t_array_api.c
View file

@ -1,4 +1,4 @@
/* $Id: t_array_api.c,v 1.25 2002/04/09 16:56:50 keithw Exp $ */
/* $Id: t_array_api.c,v 1.26 2002/04/19 00:45:50 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -129,7 +129,7 @@ _tnl_DrawArrays(GLenum mode, GLint start, GLsizei count)
if (ctx->CompileFlag) {
fallback_drawarrays( ctx, mode, start, start + count );
}
else if (!ctx->Array.LockCount && count < thresh) {
else if (!ctx->Array.LockCount && (GLuint) count < thresh) {
/* Small primitives: attempt to share a vb (at the expense of
* using the immediate interface).
*/

8
src/mesa/tnl/t_array_import.c
View file

@ -1,4 +1,4 @@
/* $Id: t_array_import.c,v 1.22 2002/01/22 14:35:16 brianp Exp $ */
/* $Id: t_array_import.c,v 1.23 2002/04/19 00:45:50 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -81,7 +81,7 @@ static void _tnl_import_normal( GLcontext *ctx,
stride ? 3*sizeof(GLfloat) : 0, writeable,
&is_writeable);
inputs->Normal.data = tmp->Ptr;
inputs->Normal.data = (GLfloat (*)[4]) tmp->Ptr;
inputs->Normal.start = (GLfloat *) tmp->Ptr;
inputs->Normal.stride = tmp->StrideB;
inputs->Normal.flags &= ~(VEC_BAD_STRIDE|VEC_NOT_WRITEABLE);
@ -394,11 +394,13 @@ void _tnl_vb_bind_arrays( GLcontext *ctx, GLint start, GLsizei count )
if (ctx->VertexProgram.Enabled) {
/* XXX lots of work to do here */
printf("bind vp arrays!\n");
VB->AttribPtr[VERT_ATTRIB_POS] = VB->ObjPtr;
/*
printf("bind vp arrays!\n");
printf(" data = %p\n", VB->ObjPtr->data);
printf(" stride = %d\n", VB->ObjPtr->stride);
printf(" size = %d\n", VB->ObjPtr->size);
*/
VB->AttribPtr[VERT_ATTRIB_NORMAL] = VB->NormalPtr;
}

6
src/mesa/tnl/t_imm_dlist.c
View file

@ -1,4 +1,4 @@
/* $Id: t_imm_dlist.c,v 1.39 2002/04/09 16:56:52 keithw Exp $ */
/* $Id: t_imm_dlist.c,v 1.40 2002/04/19 00:45:50 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -76,7 +76,7 @@ static void build_normal_lengths( struct immediate *IM )
GLuint count = IM->Count - IM->Start;
if (!dest) {
dest = IM->NormalLengthPtr = ALIGN_MALLOC( IMM_SIZE*sizeof(GLfloat), 32 );
dest = IM->NormalLengthPtr = (GLfloat *) ALIGN_MALLOC( IMM_SIZE*sizeof(GLfloat), 32 );
if (!dest) return;
}
dest += IM->Start;
@ -391,7 +391,7 @@ destroy_compiled_cassette( GLcontext *ctx, void *data )
TNLvertexcassette *node = (TNLvertexcassette *)data;
if ( --node->IM->ref_count == 0 )
_tnl_free_immediate( node->IM );
_tnl_free_immediate( ctx, node->IM );
}