diff options
| author | Francisco Jerez <[email protected]> | 2016-05-12 00:39:06 -0700 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2016-05-23 14:05:20 -0700 |
| commit | e98cf031149cd6031b3e22bc06be0a70550ac85b (patch) | |
| tree | c67e14183cc5c32186c772b9dcd65f5646659a01 | |
| parent | f471d3eedeeffd0dfcc4b9bdd6135f731cec96e9 (diff) | |
i965/fs: Fix signedness of local variables and arguments of emit_(un)spill.
To avoid some some spurious warnings about comparison signedness in
the following commits.
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index de583e3990c..b0899dc085b 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -211,9 +211,9 @@ public: bool opt_cmod_propagation(); bool opt_zero_samples(); void emit_unspill(bblock_t *block, fs_inst *inst, fs_reg reg, - uint32_t spill_offset, int count); + uint32_t spill_offset, unsigned count); void emit_spill(bblock_t *block, fs_inst *inst, fs_reg reg, - uint32_t spill_offset, int count); + uint32_t spill_offset, unsigned count); void emit_nir_code(); void nir_setup_inputs(); diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp index c2e1cdb7dfd..e3ed674d056 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp @@ -766,9 +766,9 @@ namespace { void fs_visitor::emit_unspill(bblock_t *block, fs_inst *inst, fs_reg dst, - uint32_t spill_offset, int count) + uint32_t spill_offset, unsigned count) { - int reg_size = 1; + unsigned reg_size = 1; if (dispatch_width == 16 && count % 2 == 0) reg_size = 2; @@ -776,7 +776,7 @@ fs_visitor::emit_unspill(bblock_t *block, fs_inst *inst, fs_reg dst, .group(reg_size * 8, 0) .at(block, inst); - for (int i = 0; i < count / reg_size; i++) { + for (unsigned i = 0; i < count / reg_size; i++) { /* The Gen7 descriptor-based offset is 12 bits of HWORD units. Because * the Gen7-style scratch block read is hardwired to BTI 255, on Gen9+ * it would cause the DC to do an IA-coherent read, what largely @@ -805,9 +805,9 @@ fs_visitor::emit_unspill(bblock_t *block, fs_inst *inst, fs_reg dst, void fs_visitor::emit_spill(bblock_t *block, fs_inst *inst, fs_reg src, - uint32_t spill_offset, int count) + uint32_t spill_offset, unsigned count) { - int reg_size = 1; + unsigned reg_size = 1; if (dispatch_width == 16 && count % 2 == 0) reg_size = 2; @@ -815,7 +815,7 @@ fs_visitor::emit_spill(bblock_t *block, fs_inst *inst, fs_reg src, .group(reg_size * 8, 0) .at(block, inst->next); - for (int i = 0; i < count / reg_size; i++) { + for (unsigned i = 0; i < count / reg_size; i++) { fs_inst *spill_inst = ibld.emit(SHADER_OPCODE_GEN4_SCRATCH_WRITE, ibld.null_reg_f(), src); src.reg_offset += reg_size; |