From e4fcea2e06571b71a85b4f100c95d866a82f7c19 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 19 Sep 2003 15:38:15 +0000 Subject: Assorted casts to silence g++ warnings. --- src/mesa/array_cache/ac_context.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/mesa/array_cache') diff --git a/src/mesa/array_cache/ac_context.c b/src/mesa/array_cache/ac_context.c index b259d5d071..e22f771b67 100644 --- a/src/mesa/array_cache/ac_context.c +++ b/src/mesa/array_cache/ac_context.c @@ -48,7 +48,7 @@ static void _ac_fallbacks_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 0; - cl->Ptr = (void *) ctx->Current.Attrib[VERT_ATTRIB_NORMAL]; + cl->Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_NORMAL]; cl->Enabled = 1; cl->Flags = CA_CLIENT_DATA; /* hack */ #if FEATURE_ARB_vertex_buffer_object @@ -60,7 +60,7 @@ static void _ac_fallbacks_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 0; - cl->Ptr = (void *) ctx->Current.Attrib[VERT_ATTRIB_COLOR0]; + cl->Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_COLOR0]; cl->Enabled = 1; cl->Flags = CA_CLIENT_DATA; /* hack */ #if FEATURE_ARB_vertex_buffer_object @@ -72,7 +72,7 @@ static void _ac_fallbacks_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 0; - cl->Ptr = (void *) ctx->Current.Attrib[VERT_ATTRIB_COLOR1]; + cl->Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_COLOR1]; cl->Enabled = 1; cl->Flags = CA_CLIENT_DATA; /* hack */ #if FEATURE_ARB_vertex_buffer_object @@ -84,7 +84,7 @@ static void _ac_fallbacks_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 0; - cl->Ptr = (void *) &ctx->Current.Attrib[VERT_ATTRIB_FOG]; + cl->Ptr = (GLubyte *) &ctx->Current.Attrib[VERT_ATTRIB_FOG]; cl->Enabled = 1; cl->Flags = CA_CLIENT_DATA; /* hack */ #if FEATURE_ARB_vertex_buffer_object @@ -96,7 +96,7 @@ static void _ac_fallbacks_init( GLcontext *ctx ) cl->Type = GL_UNSIGNED_INT; cl->Stride = 0; cl->StrideB = 0; - cl->Ptr = (void *) &ctx->Current.Index; + cl->Ptr = (GLubyte *) &ctx->Current.Index; cl->Enabled = 1; cl->Flags = CA_CLIENT_DATA; /* hack */ #if FEATURE_ARB_vertex_buffer_object @@ -109,7 +109,7 @@ static void _ac_fallbacks_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 0; - cl->Ptr = (void *) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i]; + cl->Ptr = (GLubyte *) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i]; cl->Enabled = 1; cl->Flags = CA_CLIENT_DATA; /* hack */ #if FEATURE_ARB_vertex_buffer_object @@ -122,7 +122,7 @@ static void _ac_fallbacks_init( GLcontext *ctx ) cl->Type = GL_UNSIGNED_BYTE; cl->Stride = 0; cl->StrideB = 0; - cl->Ptr = (void *) &ctx->Current.EdgeFlag; + cl->Ptr = (GLubyte *) &ctx->Current.EdgeFlag; cl->Enabled = 1; cl->Flags = CA_CLIENT_DATA; /* hack */ #if FEATURE_ARB_vertex_buffer_object @@ -135,7 +135,7 @@ static void _ac_fallbacks_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 0; - cl->Ptr = (void *) ctx->Current.Attrib[i]; + cl->Ptr = (GLubyte *) ctx->Current.Attrib[i]; cl->Enabled = 1; cl->Flags = CA_CLIENT_DATA; /* hack */ #if FEATURE_ARB_vertex_buffer_object @@ -160,7 +160,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 4 * sizeof(GLfloat); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object @@ -172,7 +172,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 3 * sizeof(GLfloat); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object @@ -184,7 +184,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 4 * sizeof(GLfloat); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object @@ -196,7 +196,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 4 * sizeof(GLfloat); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object @@ -208,7 +208,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = sizeof(GLfloat); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object @@ -220,7 +220,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_UNSIGNED_INT; cl->Stride = 0; cl->StrideB = sizeof(GLuint); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object @@ -233,7 +233,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 4 * sizeof(GLfloat); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object @@ -246,7 +246,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_UNSIGNED_BYTE; cl->Stride = 0; cl->StrideB = sizeof(GLubyte); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object @@ -259,7 +259,7 @@ static void _ac_cache_init( GLcontext *ctx ) cl->Type = GL_FLOAT; cl->Stride = 0; cl->StrideB = 4 * sizeof(GLfloat); - cl->Ptr = MALLOC( cl->StrideB * size ); + cl->Ptr = (GLubyte *) MALLOC( cl->StrideB * size ); cl->Enabled = 1; cl->Flags = 0; #if FEATURE_ARB_vertex_buffer_object -- cgit v1.2.3