intel: replace MAYBE_UNUSED with UNUSED

MAYBE_UNUSED is going away, so let's replace legitimate uses of it with
UNUSED, which the former aliased to so far anyway.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Eric Engestrom
2019-06-22 13:31:53 +01:00
parent e775b938b2
commit eee70e09bf
5 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -1074,7 +1074,7 @@ blorp_emit_blend_state(struct blorp_batch *batch,
static uint32_t
blorp_emit_color_calc_state(struct blorp_batch *batch,
MAYBE_UNUSED const struct blorp_params *params)
UNUSED const struct blorp_params *params)
{
uint32_t offset;
blorp_emit_dynamic(batch, GENX(COLOR_CALC_STATE), cc, 64, &offset) {
@@ -1475,7 +1475,7 @@ blorp_emit_surface_states(struct blorp_batch *batch,
uint32_t bind_offset = 0, surface_offsets[2];
void *surface_maps[2];
MAYBE_UNUSED bool has_indirect_clear_color = false;
UNUSED bool has_indirect_clear_color = false;
if (params->use_pre_baked_binding_table) {
bind_offset = params->pre_baked_binding_table_offset;
} else {
+1 -1
View File
@@ -278,7 +278,7 @@ def output_counter_read(gen, set, counter):
read_eq = counter.get('equation')
c("static " + ret_type)
c(counter.read_sym + "(MAYBE_UNUSED struct gen_perf *perf,\n")
c(counter.read_sym + "(UNUSED struct gen_perf *perf,\n")
c_indent(len(counter.read_sym) + 1)
c("const struct gen_perf_query_info *query,\n")
c("const uint64_t *accumulator)\n")
+1 -1
View File
@@ -1781,7 +1781,7 @@ emit_3dstate_ps(struct anv_pipeline *pipeline,
const VkPipelineColorBlendStateCreateInfo *blend,
const VkPipelineMultisampleStateCreateInfo *multisample)
{
MAYBE_UNUSED const struct gen_device_info *devinfo = &pipeline->device->info;
UNUSED const struct gen_device_info *devinfo = &pipeline->device->info;
const struct anv_shader_bin *fs_bin =
pipeline->shaders[MESA_SHADER_FRAGMENT];