From 477ac09c9e1d2d6c174cb6102ce806323da8c5c7 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 25 Aug 2017 20:40:13 -0700 Subject: [PATCH] i965: Mark functions used conditionally as UNUSED The functions we're marking as UNUSED in genX_state_upload.c are used only when compiling for particular generations. Reviewed-by: Emil Velikov Reviewed-by: Eric Engestrom --- src/mesa/drivers/dri/i965/genX_state_upload.c | 4 ++-- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index eb370db0237..3c2dc954823 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -119,7 +119,7 @@ ro_bo(struct brw_bo *bo, uint32_t offset) }; } -static struct brw_address +UNUSED static struct brw_address ggtt_bo(struct brw_bo *bo, uint32_t offset) { return (struct brw_address) { @@ -3036,7 +3036,7 @@ genX(upload_push_constant_packets)(struct brw_context *brw) for (int stage = 0; stage <= MESA_SHADER_FRAGMENT; stage++) { struct brw_stage_state *stage_state = stage_states[stage]; - struct gl_program *prog = ctx->_Shader->CurrentProgram[stage]; + UNUSED struct gl_program *prog = ctx->_Shader->CurrentProgram[stage]; if (!stage_state->push_constants_dirty) continue; diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index ef4a2b80955..3fd5af4e3b5 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -397,7 +397,7 @@ brw_get_num_logical_layers(const struct intel_mipmap_tree *mt, unsigned level) return mt->surf.logical_level0_px.array_len; } -static unsigned +UNUSED static unsigned get_num_phys_layers(const struct isl_surf *surf, unsigned level) { /* In case of physical dimensions one needs to consider also the layout. -- 2.30.2