diff options
| author | Eric Engestrom <[email protected]> | 2019-06-22 13:31:53 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-07-31 09:41:05 +0100 |
| commit | eee70e09bf2e24e6baec30a6569dfcb2155e467b (patch) | |
| tree | b117670a0fa158b32be6a84dea718521f6a5ef26 /src/intel | |
| parent | e775b938b25fb78129963f8323181997c265bc42 (diff) | |
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 <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/blorp/blorp_genX_exec.h | 4 | ||||
| -rw-r--r-- | src/intel/perf/gen_perf.py | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/genX_pipeline.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h index 7a74b1d9d50..379d7a59b64 100644 --- a/src/intel/blorp/blorp_genX_exec.h +++ b/src/intel/blorp/blorp_genX_exec.h @@ -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 { diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py index 8874845613a..ef3aca64f2e 100644 --- a/src/intel/perf/gen_perf.py +++ b/src/intel/perf/gen_perf.py @@ -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") diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index ebfcbb28a95..68723378554 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -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]; |