From: Ian Romanick Date: Tue, 19 Nov 2019 03:42:22 +0000 (-0800) Subject: mesa: Silence unused parameter warning X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=78409856094d58907915406ce87d385a8012eed6;p=mesa.git mesa: Silence unused parameter warning Unused since e4da8b9c331 ("mesa/compiler: rework tear down of builtin/types"). src/mesa/main/context.c: In function ‘_mesa_free_context_data’: src/mesa/main/context.c:1321:54: warning: unused parameter ‘destroy_compiler_types’ [-Wunused-parameter] 1321 | _mesa_free_context_data(struct gl_context *ctx, bool destroy_compiler_types) | ^ Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Eric Engestrom --- diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 14b56f614d9..993ad8bf05f 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -599,7 +599,7 @@ intelDestroyContext(__DRIcontext * driContextPriv) driDestroyOptionCache(&intel->optionCache); /* free the Mesa context */ - _mesa_free_context_data(&intel->ctx, true); + _mesa_free_context_data(&intel->ctx); _math_matrix_dtr(&intel->ViewportMatrix); diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index ac84864f521..aea2baa64fe 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -1227,7 +1227,7 @@ intelDestroyContext(__DRIcontext * driContextPriv) driDestroyOptionCache(&brw->optionCache); /* free the Mesa context */ - _mesa_free_context_data(&brw->ctx, true); + _mesa_free_context_data(&brw->ctx); ralloc_free(brw); driContextPriv->driverPrivate = NULL; diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c index 40102cfa4df..838e909ee3f 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c @@ -217,7 +217,7 @@ nouveau_context_deinit(struct gl_context *ctx) nouveau_object_del(&nctx->hw.chan); nouveau_scratch_destroy(ctx); - _mesa_free_context_data(ctx, true); + _mesa_free_context_data(ctx); } void diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index 689304aa4fc..47719baa575 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -270,7 +270,7 @@ void radeonDestroyContext(__DRIcontext *driContextPriv ) /* free atom list */ /* free the Mesa context data */ - _mesa_free_context_data(&radeon->glCtx, true); + _mesa_free_context_data(&radeon->glCtx); /* free the option cache */ driDestroyOptionCache(&radeon->optionCache); diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 52bd9a14866..9aeb4059a91 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -857,7 +857,7 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist) osmesa->gl_buffer = _mesa_create_framebuffer(osmesa->gl_visual); if (!osmesa->gl_buffer) { _mesa_destroy_visual( osmesa->gl_visual ); - _mesa_free_context_data(&osmesa->mesa, true); + _mesa_free_context_data(&osmesa->mesa); free(osmesa); return NULL; } @@ -894,7 +894,7 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist) !_tnl_CreateContext( ctx ) || !_swsetup_CreateContext( ctx )) { _mesa_destroy_visual(osmesa->gl_visual); - _mesa_free_context_data(ctx, true); + _mesa_free_context_data(ctx); free(osmesa); return NULL; } @@ -922,7 +922,7 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist) if (ctx->Version < version_major * 10 + version_minor) { _mesa_destroy_visual(osmesa->gl_visual); - _mesa_free_context_data(ctx, true); + _mesa_free_context_data(ctx); free(osmesa); return NULL; } @@ -958,7 +958,7 @@ OSMesaDestroyContext( OSMesaContext osmesa ) _mesa_destroy_visual( osmesa->gl_visual ); _mesa_reference_framebuffer( &osmesa->gl_buffer, NULL ); - _mesa_free_context_data(&osmesa->mesa, true); + _mesa_free_context_data(&osmesa->mesa); free( osmesa ); } } diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 63936ac3e16..1e8e6a9d71a 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -944,7 +944,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) !_vbo_CreateContext( mesaCtx ) || !_tnl_CreateContext( mesaCtx ) || !_swsetup_CreateContext( mesaCtx )) { - _mesa_free_context_data(&c->mesa, true); + _mesa_free_context_data(&c->mesa); free(c); return NULL; } @@ -981,7 +981,7 @@ void XMesaDestroyContext( XMesaContext c ) _swrast_DestroyContext( mesaCtx ); _tnl_DestroyContext( mesaCtx ); _vbo_DestroyContext( mesaCtx ); - _mesa_free_context_data(mesaCtx, true); + _mesa_free_context_data(mesaCtx); free( c ); } diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 5a8f0ff191e..a5bf99a266d 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1318,7 +1318,7 @@ fail: * \sa _mesa_initialize_context() and init_attrib_groups(). */ void -_mesa_free_context_data(struct gl_context *ctx, bool destroy_compiler_types) +_mesa_free_context_data(struct gl_context *ctx) { if (!_mesa_get_current_context()){ /* No current context, but we may need one in order to delete @@ -1421,7 +1421,7 @@ void _mesa_destroy_context( struct gl_context *ctx ) { if (ctx) { - _mesa_free_context_data(ctx, true); + _mesa_free_context_data(ctx); free( (void *) ctx ); } } diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index e9b270df14c..58123155002 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -115,7 +115,7 @@ _mesa_initialize_context( struct gl_context *ctx, const struct dd_function_table *driverFunctions); extern void -_mesa_free_context_data(struct gl_context *ctx, bool destroy_compiler_types); +_mesa_free_context_data(struct gl_context *ctx); extern void _mesa_destroy_context( struct gl_context *ctx ); diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index ed50c332c22..45043e6048e 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -1076,7 +1076,7 @@ st_destroy_context(struct st_context *st) st_destroy_program_variants(st); - _mesa_free_context_data(ctx, false); + _mesa_free_context_data(ctx); /* This will free the st_context too, so 'st' must not be accessed * afterwards. */