aco: Remove nonstandard parentheses
Remove parentheses in cases where a parenthesized type is followed by an initializer list. Reviewed-by: Rhys Perry <pendingchaos02@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7785>
This commit is contained in:
parent
d1f742e497
commit
93094b8c5e
|
@ -703,7 +703,7 @@ Temp get_alu_src(struct isel_context *ctx, nir_alu_src src, unsigned size=1)
|
|||
|
||||
uint32_t get_alu_src_ub(isel_context *ctx, nir_alu_instr *instr, int src_idx)
|
||||
{
|
||||
nir_ssa_scalar scalar = (nir_ssa_scalar){instr->src[src_idx].src.ssa,
|
||||
nir_ssa_scalar scalar = nir_ssa_scalar{instr->src[src_idx].src.ssa,
|
||||
instr->src[src_idx].swizzle[0]};
|
||||
return nir_unsigned_upper_bound(ctx->shader, ctx->range_ht, scalar, &ctx->ub_config);
|
||||
}
|
||||
|
@ -4655,14 +4655,20 @@ uint8_t get_fetch_data_format(isel_context *ctx, const ac_data_format_info *vtx_
|
|||
|
||||
switch (vtx_info->chan_format) {
|
||||
case V_008F0C_BUF_DATA_FORMAT_8:
|
||||
return (uint8_t[]){V_008F0C_BUF_DATA_FORMAT_8, V_008F0C_BUF_DATA_FORMAT_8_8,
|
||||
V_008F0C_BUF_DATA_FORMAT_INVALID, V_008F0C_BUF_DATA_FORMAT_8_8_8_8}[num_channels - 1];
|
||||
return std::array<uint8_t, 4>{V_008F0C_BUF_DATA_FORMAT_8,
|
||||
V_008F0C_BUF_DATA_FORMAT_8_8,
|
||||
V_008F0C_BUF_DATA_FORMAT_INVALID,
|
||||
V_008F0C_BUF_DATA_FORMAT_8_8_8_8}[num_channels - 1];
|
||||
case V_008F0C_BUF_DATA_FORMAT_16:
|
||||
return (uint8_t[]){V_008F0C_BUF_DATA_FORMAT_16, V_008F0C_BUF_DATA_FORMAT_16_16,
|
||||
V_008F0C_BUF_DATA_FORMAT_INVALID, V_008F0C_BUF_DATA_FORMAT_16_16_16_16}[num_channels - 1];
|
||||
return std::array<uint8_t, 4>{V_008F0C_BUF_DATA_FORMAT_16,
|
||||
V_008F0C_BUF_DATA_FORMAT_16_16,
|
||||
V_008F0C_BUF_DATA_FORMAT_INVALID,
|
||||
V_008F0C_BUF_DATA_FORMAT_16_16_16_16}[num_channels - 1];
|
||||
case V_008F0C_BUF_DATA_FORMAT_32:
|
||||
return (uint8_t[]){V_008F0C_BUF_DATA_FORMAT_32, V_008F0C_BUF_DATA_FORMAT_32_32,
|
||||
V_008F0C_BUF_DATA_FORMAT_32_32_32, V_008F0C_BUF_DATA_FORMAT_32_32_32_32}[num_channels - 1];
|
||||
return std::array<uint8_t, 4>{V_008F0C_BUF_DATA_FORMAT_32,
|
||||
V_008F0C_BUF_DATA_FORMAT_32_32,
|
||||
V_008F0C_BUF_DATA_FORMAT_32_32_32,
|
||||
V_008F0C_BUF_DATA_FORMAT_32_32_32_32}[num_channels - 1];
|
||||
}
|
||||
unreachable("shouldn't reach here");
|
||||
return V_008F0C_BUF_DATA_FORMAT_INVALID;
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <math.h>
|
||||
|
||||
#include "aco_ir.h"
|
||||
|
@ -2266,10 +2267,10 @@ bool combine_salu_lshl_add(opt_ctx& ctx, aco_ptr<Instruction>& instr)
|
|||
instr->operands[0] = op2_instr->operands[0];
|
||||
ctx.info[instr->definitions[0].tempId()].label = 0;
|
||||
|
||||
instr->opcode = ((aco_opcode[]){aco_opcode::s_lshl1_add_u32,
|
||||
instr->opcode = std::array<aco_opcode, 4>{aco_opcode::s_lshl1_add_u32,
|
||||
aco_opcode::s_lshl2_add_u32,
|
||||
aco_opcode::s_lshl3_add_u32,
|
||||
aco_opcode::s_lshl4_add_u32})[shift - 1];
|
||||
aco_opcode::s_lshl4_add_u32}[shift - 1];
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -316,7 +316,7 @@ void get_rematerialize_info(spill_ctx& ctx)
|
|||
if (logical && should_rematerialize(instr)) {
|
||||
for (const Definition& def : instr->definitions) {
|
||||
if (def.isTemp()) {
|
||||
ctx.remat[def.getTemp()] = (remat_info){instr.get()};
|
||||
ctx.remat[def.getTemp()] = remat_info{instr.get()};
|
||||
ctx.remat_used[instr.get()] = false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue