fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 20:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel: drop incorrect MAYBE_UNUSED

Browse source 
All these are actually always used.

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 18:02:52 +01:00
parent 14be04fb2b
commit e775b938b2
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/isl/isl.c
View file

@ -1193,7 +1193,7 @@ isl_calc_phys_total_extent_el_gen9_1d(
uint32_t *array_pitch_el_rows,
struct isl_extent2d *phys_total_el)
{
MAYBE_UNUSED const struct isl_format_layout *fmtl = isl_format_get_layout(info->format);
const struct isl_format_layout *fmtl = isl_format_get_layout(info->format);
assert(phys_level0_sa->height == 1);
assert(phys_level0_sa->depth == 1);

2
src/intel/vulkan/anv_batch_chain.c
View file

@ -418,7 +418,7 @@ anv_batch_bo_link(struct anv_cmd_buffer *cmd_buffer,
struct anv_batch_bo *next_bbo,
uint32_t next_bbo_offset)
{
MAYBE_UNUSED const uint32_t bb_start_offset =
const uint32_t bb_start_offset =
prev_bbo->length - GEN8_MI_BATCH_BUFFER_START_length * 4;
MAYBE_UNUSED const uint32_t *bb_start = prev_bbo->bo.map + bb_start_offset;

4
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -1731,7 +1731,7 @@ genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer,
assert(!urb_low_bw || cfg->n[GEN_L3P_URB] == cfg->n[GEN_L3P_SLM]);
/* Minimum number of ways that can be allocated to the URB. */
MAYBE_UNUSED const unsigned n0_urb = devinfo->is_baytrail ? 32 : 0;
const unsigned n0_urb = devinfo->is_baytrail ? 32 : 0;
assert(cfg->n[GEN_L3P_URB] >= n0_urb);
uint32_t l3sqcr1, l3cr2, l3cr3;
@ -3540,7 +3540,7 @@ void
genX(cmd_buffer_flush_compute_state)(struct anv_cmd_buffer *cmd_buffer)
{
struct anv_pipeline *pipeline = cmd_buffer->state.compute.base.pipeline;
MAYBE_UNUSED VkResult result;
VkResult result;
assert(pipeline->active_stages == VK_SHADER_STAGE_COMPUTE_BIT);

2
src/intel/vulkan/genX_pipeline.c
View file

@ -955,7 +955,7 @@ emit_ds_state(struct anv_pipeline *pipeline,
#endif
}
MAYBE_UNUSED static bool
static bool
is_dual_src_blend_factor(VkBlendFactor factor)
{
return factor == VK_BLEND_FACTOR_SRC1_COLOR ||

4
src/mesa/drivers/dri/i965/genX_state_upload.c
View file

@ -74,7 +74,7 @@ KSP(UNUSED struct brw_context *brw, uint32_t offset)
#endif
#if GEN_GEN >= 7
MAYBE_UNUSED static void
static void
emit_lrm(struct brw_context *brw, uint32_t reg, struct brw_address addr)
{
brw_batch_emit(brw, GENX(MI_LOAD_REGISTER_MEM), lrm) {
@ -4941,7 +4941,7 @@ has_component(mesa_format format, int i)
static void
genX(upload_default_color)(struct brw_context *brw,
const struct gl_sampler_object *sampler,
MAYBE_UNUSED mesa_format format, GLenum base_format,
mesa_format format, GLenum base_format,
bool is_integer_format, bool is_stencil_sampling,
uint32_t *sdc_offset)
{

4
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View file

@ -1577,7 +1577,7 @@ intel_miptree_alloc_aux(struct brw_context *brw,
enum isl_aux_state initial_state;
uint8_t memset_value;
struct isl_surf aux_surf;
MAYBE_UNUSED bool aux_surf_ok = false;
bool aux_surf_ok = false;
switch (mt->aux_usage) {
case ISL_AUX_USAGE_NONE:
@ -2963,7 +2963,7 @@ intel_miptree_unmap_tiled_memcpy(struct brw_context *brw,
*
* \return true if the format and type combination are valid
*/
MAYBE_UNUSED isl_memcpy_type
isl_memcpy_type
intel_miptree_get_memcpy_type(mesa_format tiledFormat, GLenum format, GLenum type,
uint32_t *cpp)
{