From a0c85249244e1af8dac88076d5f384cf4bd01236 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Fri, 11 Feb 2005 09:34:05 +0000 Subject: [PATCH] mesa-main-0-NULL.patch from Jeff Muizelaar --- src/mesa/main/api_arrayelt.c | 50 ++++++++++++++++++------------------ src/mesa/main/bufferobj.c | 2 +- src/mesa/main/dlist.c | 2 +- src/mesa/main/enums.c | 4 +-- src/mesa/main/getstring.c | 2 +- src/mesa/main/light.c | 5 ++-- src/mesa/main/texcompress.c | 2 +- src/mesa/main/texobj.c | 2 +- 8 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 12ea41379cc..cb827c2ec9c 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -229,32 +229,32 @@ static void GLAPIENTRY Vertex4dv(const GLdouble *v) static const array_func VertexFuncs[3][8] = { { - 0, - 0, + NULL, + NULL, (array_func) Vertex2sv, - 0, + NULL, (array_func) Vertex2iv, - 0, + NULL, (array_func) Vertex2fv, (array_func) Vertex2dv, }, { - 0, - 0, + NULL, + NULL, (array_func) Vertex3sv, - 0, + NULL, (array_func) Vertex3iv, - 0, + NULL, (array_func) Vertex3fv, (array_func) Vertex3dv, }, { - 0, - 0, + NULL, + NULL, (array_func) Vertex4sv, - 0, + NULL, (array_func) Vertex4iv, - 0, + NULL, (array_func) Vertex4fv, (array_func) Vertex4dv, }, @@ -286,12 +286,12 @@ static void GLAPIENTRY Indexdv(const GLdouble *c) } static const array_func IndexFuncs[8] = { - 0, + NULL, (array_func) Indexubv, (array_func) Indexsv, - 0, + NULL, (array_func) Indexiv, - 0, + NULL, (array_func) Indexfv, (array_func) Indexdv, }; @@ -323,11 +323,11 @@ static void GLAPIENTRY Normal3dv(const GLdouble *v) static const array_func NormalFuncs[8] = { (array_func) Normal3bv, - 0, + NULL, (array_func) Normal3sv, - 0, + NULL, (array_func) Normal3iv, - 0, + NULL, (array_func) Normal3fv, (array_func) Normal3dv, }; @@ -397,12 +397,12 @@ static void GLAPIENTRY FogCoorddvEXT(const GLdouble *f) } static const array_func FogCoordFuncs[8] = { - 0, - 0, - 0, - 0, - 0, - 0, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, (array_func) FogCoordfvEXT, (array_func) FogCoorddvEXT }; @@ -866,7 +866,7 @@ void _ae_destroy_context( GLcontext *ctx ) { if ( AE_CONTEXT( ctx ) ) { FREE( ctx->aelt_context ); - ctx->aelt_context = 0; + ctx->aelt_context = NULL; } } diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 9d2fc95be31..3ca08859a74 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -474,7 +474,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object *oldBufObj; - struct gl_buffer_object *newBufObj = 0; + struct gl_buffer_object *newBufObj = NULL; ASSERT_OUTSIDE_BEGIN_END(ctx); oldBufObj = buffer_object_get_target( ctx, target, "BindBufferARB" ); diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index f95e8db98cb..effdb7702a7 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -5169,7 +5169,7 @@ static void GLAPIENTRY save_Materialfv( GLenum face, GLenum pname, const GLfloat } { - GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0, 0 ); + GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0, NULL ); for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) if (bitmask & (1<ListState.ActiveMaterialSize[i] = args; diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c index 8f61187a3da..946b5b96a45 100644 --- a/src/mesa/main/enums.c +++ b/src/mesa/main/enums.c @@ -964,8 +964,8 @@ static enum_elt all_enums[] = typedef int (*cfunc)(const void *, const void *); -static enum_elt **index1 = 0; -static int sorted = 0; +static enum_elt **index1; +static int sorted; static int compar_name( const enum_elt *a, const enum_elt *b ) { diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 38b13e90f3b..5188a79c951 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -56,7 +56,7 @@ _mesa_GetString( GLenum name ) static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING; static const char *version_2_0 = "1.5 Mesa " MESA_VERSION_STRING;/*XXX FIX*/ - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); + ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL); /* this is a required driver function */ assert(ctx->Driver.GetString); diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 0cf2635765f..4c39d2ff4c9 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -876,7 +876,7 @@ _mesa_invalidate_shine_table( GLcontext *ctx, GLuint side ) ASSERT(side < 2); if (ctx->_ShineTable[side]) ctx->_ShineTable[side]->refcount--; - ctx->_ShineTable[side] = 0; + ctx->_ShineTable[side] = NULL; } @@ -1281,7 +1281,8 @@ _mesa_init_lighting( GLcontext *ctx ) ctx->Light.ColorMaterialMode = GL_AMBIENT_AND_DIFFUSE; ctx->Light.ColorMaterialBitmask = _mesa_material_bitmask( ctx, GL_FRONT_AND_BACK, - GL_AMBIENT_AND_DIFFUSE, ~0, 0 ); + GL_AMBIENT_AND_DIFFUSE, ~0, + NULL ); ctx->Light.ColorMaterialEnabled = GL_FALSE; diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index 396f14a5663..d18b1d0b418 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -247,7 +247,7 @@ _mesa_compressed_image_address(GLint col, GLint row, GLint img, addr = (GLubyte *) image + 16 * (((width + 3) / 4) * (row / 4) + col / 4); break; default: - return 0; + return NULL; } return addr; diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 1691ae13879..e6e39d4b434 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -700,7 +700,7 @@ _mesa_BindTexture( GLenum target, GLuint texName ) GLuint unit = ctx->Texture.CurrentUnit; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; struct gl_texture_object *oldTexObj; - struct gl_texture_object *newTexObj = 0; + struct gl_texture_object *newTexObj = NULL; ASSERT_OUTSIDE_BEGIN_END(ctx); if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE)) -- 2.30.2