OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa-main-0-NULL.patch from Jeff Muizelaar

Browse Source
This commit is contained in:
Keith Whitwell
2005-02-11 09:34:05 +00:00
parent 2d10924a14
commit a0c8524924
8 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/mesa/main/api_arrayelt.c
View File

@@ -229,32 +229,32 @@ static void GLAPIENTRY Vertex4dv(const GLdouble *v)
static const array_func VertexFuncs[3][8] = { static const array_func VertexFuncs[3][8] = {
{ {
0, NULL,
0, NULL,
(array_func) Vertex2sv, (array_func) Vertex2sv,
0, NULL,
(array_func) Vertex2iv, (array_func) Vertex2iv,
0, NULL,
(array_func) Vertex2fv, (array_func) Vertex2fv,
(array_func) Vertex2dv, (array_func) Vertex2dv,
}, },
{ {
0, NULL,
0, NULL,
(array_func) Vertex3sv, (array_func) Vertex3sv,
0, NULL,
(array_func) Vertex3iv, (array_func) Vertex3iv,
0, NULL,
(array_func) Vertex3fv, (array_func) Vertex3fv,
(array_func) Vertex3dv, (array_func) Vertex3dv,
}, },
{ {
0, NULL,
0, NULL,
(array_func) Vertex4sv, (array_func) Vertex4sv,
0, NULL,
(array_func) Vertex4iv, (array_func) Vertex4iv,
0, NULL,
(array_func) Vertex4fv, (array_func) Vertex4fv,
(array_func) Vertex4dv, (array_func) Vertex4dv,
}, },
@@ -286,12 +286,12 @@ static void GLAPIENTRY Indexdv(const GLdouble *c)
} }
static const array_func IndexFuncs[8] = { static const array_func IndexFuncs[8] = {
0, NULL,
(array_func) Indexubv, (array_func) Indexubv,
(array_func) Indexsv, (array_func) Indexsv,
0, NULL,
(array_func) Indexiv, (array_func) Indexiv,
0, NULL,
(array_func) Indexfv, (array_func) Indexfv,
(array_func) Indexdv, (array_func) Indexdv,
}; };
@@ -323,11 +323,11 @@ static void GLAPIENTRY Normal3dv(const GLdouble *v)
static const array_func NormalFuncs[8] = { static const array_func NormalFuncs[8] = {
(array_func) Normal3bv, (array_func) Normal3bv,
0, NULL,
(array_func) Normal3sv, (array_func) Normal3sv,
0, NULL,
(array_func) Normal3iv, (array_func) Normal3iv,
0, NULL,
(array_func) Normal3fv, (array_func) Normal3fv,
(array_func) Normal3dv, (array_func) Normal3dv,
}; };
@@ -397,12 +397,12 @@ static void GLAPIENTRY FogCoorddvEXT(const GLdouble *f)
} }
static const array_func FogCoordFuncs[8] = { static const array_func FogCoordFuncs[8] = {
0, NULL,
0, NULL,
0, NULL,
0, NULL,
0, NULL,
0, NULL,
(array_func) FogCoordfvEXT, (array_func) FogCoordfvEXT,
(array_func) FogCoorddvEXT (array_func) FogCoorddvEXT
}; };
@@ -866,7 +866,7 @@ void _ae_destroy_context( GLcontext *ctx )
{ {
if ( AE_CONTEXT( ctx ) ) { if ( AE_CONTEXT( ctx ) ) {
FREE( ctx->aelt_context ); FREE( ctx->aelt_context );
ctx->aelt_context = 0; ctx->aelt_context = NULL;
} }
} }

2
src/mesa/main/bufferobj.c
View File

@@ -474,7 +474,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *oldBufObj; struct gl_buffer_object *oldBufObj;
struct gl_buffer_object *newBufObj = 0; struct gl_buffer_object *newBufObj = NULL;
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
oldBufObj = buffer_object_get_target( ctx, target, "BindBufferARB" ); oldBufObj = buffer_object_get_target( ctx, target, "BindBufferARB" );

2
src/mesa/main/dlist.c
View File

@@ -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++) for (i = 0 ; i < MAT_ATTRIB_MAX ; i++)
if (bitmask & (1<<i)) { if (bitmask & (1<<i)) {
ctx->ListState.ActiveMaterialSize[i] = args; ctx->ListState.ActiveMaterialSize[i] = args;

4
src/mesa/main/enums.c
View File

@@ -964,8 +964,8 @@ static enum_elt all_enums[] =
typedef int (*cfunc)(const void *, const void *); typedef int (*cfunc)(const void *, const void *);
static enum_elt **index1 = 0; static enum_elt **index1;
static int sorted = 0; static int sorted;
static int compar_name( const enum_elt *a, const enum_elt *b ) static int compar_name( const enum_elt *a, const enum_elt *b )
{ {

2
src/mesa/main/getstring.c
View File

@@ -56,7 +56,7 @@ _mesa_GetString( GLenum name )
static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING; 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*/ 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 */ /* this is a required driver function */
assert(ctx->Driver.GetString); assert(ctx->Driver.GetString);

5
src/mesa/main/light.c
View File

@@ -876,7 +876,7 @@ _mesa_invalidate_shine_table( GLcontext *ctx, GLuint side )
ASSERT(side < 2); ASSERT(side < 2);
if (ctx->_ShineTable[side]) if (ctx->_ShineTable[side])
ctx->_ShineTable[side]->refcount--; 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.ColorMaterialMode = GL_AMBIENT_AND_DIFFUSE;
ctx->Light.ColorMaterialBitmask = _mesa_material_bitmask( ctx, ctx->Light.ColorMaterialBitmask = _mesa_material_bitmask( ctx,
GL_FRONT_AND_BACK, GL_FRONT_AND_BACK,
GL_AMBIENT_AND_DIFFUSE, ~0, 0 ); GL_AMBIENT_AND_DIFFUSE, ~0,
NULL );
ctx->Light.ColorMaterialEnabled = GL_FALSE; ctx->Light.ColorMaterialEnabled = GL_FALSE;

2
src/mesa/main/texcompress.c
View File

@@ -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); addr = (GLubyte *) image + 16 * (((width + 3) / 4) * (row / 4) + col / 4);
break; break;
default: default:
return 0; return NULL;
} }
return addr; return addr;

2
src/mesa/main/texobj.c
View File

@@ -700,7 +700,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
GLuint unit = ctx->Texture.CurrentUnit; GLuint unit = ctx->Texture.CurrentUnit;
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
struct gl_texture_object *oldTexObj; struct gl_texture_object *oldTexObj;
struct gl_texture_object *newTexObj = 0; struct gl_texture_object *newTexObj = NULL;
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE)) if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))