diff options
author | Matt Turner <mattst88@gmail.com> | 2014-11-12 11:28:02 -0800 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2014-11-21 10:26:38 -0800 |
commit | bd502139290ea902cbc4b5f535c102f8f98774b1 (patch) | |
tree | 60e9060bdca0add890fa5fba9b25cbb43971a48e /src/mesa/drivers/dri/i965/brw_fs_generator.cpp | |
parent | 645b471d619b654d3bacfa8598f759833e08db4e (diff) | |
download | external_mesa3d-bd502139290ea902cbc4b5f535c102f8f98774b1.zip external_mesa3d-bd502139290ea902cbc4b5f535c102f8f98774b1.tar.gz external_mesa3d-bd502139290ea902cbc4b5f535c102f8f98774b1.tar.bz2 |
i965: Combine offset/texture_offset fields.
texture_offset was only used by some texturing operations, and offset
was only used by spill/unspill and some URB operations. These fields are
never used at the same time.
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs_generator.cpp')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index 0622b07..3b9bfe4 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -556,7 +556,7 @@ fs_generator::generate_tex(fs_inst *inst, struct brw_reg dst, struct brw_reg src * Otherwise, we can use an implied move from g0 to the first message reg. */ if (inst->header_present) { - if (brw->gen < 6 && !inst->texture_offset) { + if (brw->gen < 6 && !inst->offset) { /* Set up an implied move from g0 to the MRF. */ src = retype(brw_vec8_grf(0, 0), BRW_REGISTER_TYPE_UW); } else { @@ -575,10 +575,10 @@ fs_generator::generate_tex(fs_inst *inst, struct brw_reg dst, struct brw_reg src /* Explicitly set up the message header by copying g0 to the MRF. */ brw_MOV(p, header_reg, brw_vec8_grf(0, 0)); - if (inst->texture_offset) { + if (inst->offset) { /* Set the offset bits in DWord 2. */ brw_MOV(p, get_element_ud(header_reg, 2), - brw_imm_ud(inst->texture_offset)); + brw_imm_ud(inst->offset)); } brw_adjust_sampler_state_pointer(p, header_reg, sampler_index, dst); |