diff options
| author | Connor Abbott <[email protected]> | 2014-08-04 15:20:37 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-09-01 00:55:14 -0700 |
| commit | d571f2b15d8ebd6dc72e5436a9f845abe786a80f (patch) | |
| tree | deacb661b8350e7ebe0a30cff3a41724bcff0be1 /src/mesa | |
| parent | cbfcb1b06992e4310683bb54a67d011b08010ec7 (diff) | |
i965/fs: don't use ir->shadow_comparitor in emit_texture_*
Signed-off-by: Connor Abbott <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_fp.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_fp.cpp b/src/mesa/drivers/dri/i965/brw_fs_fp.cpp index c82bd9b76ac..4db3f1697e7 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_fp.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_fp.cpp @@ -480,10 +480,8 @@ fs_visitor::emit_fragment_program_code() ir_constant_data junk_data; ir->coordinate = new(mem_ctx) ir_constant(coordinate_type, &junk_data); - if (fpi->TexShadow) { + if (fpi->TexShadow) shadow_c = offset(coordinate, 2); - ir->shadow_comparitor = new(mem_ctx) ir_constant(0.0f); - } coordinate = rescale_texcoord(ir, coordinate, fpi->TexSrcTarget == TEXTURE_RECT_INDEX, diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index a6b0aefd100..2fa90a484a5 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -1149,7 +1149,7 @@ fs_visitor::emit_texture_gen4(ir_texture *ir, fs_reg dst, fs_reg coordinate, /* g0 header. */ mlen = 1; - if (ir->shadow_comparitor) { + if (shadow_c.file != BAD_FILE) { for (int i = 0; i < ir->coordinate->type->vector_elements; i++) { emit(MOV(fs_reg(MRF, base_mrf + mlen + i), coordinate)); coordinate.reg_offset++; @@ -1337,7 +1337,7 @@ fs_visitor::emit_texture_gen5(ir_texture *ir, fs_reg dst, fs_reg coordinate, } mlen += vector_elements * reg_width; - if (ir->shadow_comparitor) { + if (shadow_c.file != BAD_FILE) { mlen = MAX2(mlen, header_present + 4 * reg_width); emit(MOV(fs_reg(MRF, base_mrf + mlen), shadow_c)); @@ -1481,7 +1481,7 @@ fs_visitor::emit_texture_gen7(ir_texture *ir, fs_reg dst, fs_reg coordinate, length++; } - if (ir->shadow_comparitor) { + if (shadow_c.file != BAD_FILE) { emit(MOV(sources[length], shadow_c)); length++; } @@ -1576,7 +1576,7 @@ fs_visitor::emit_texture_gen7(ir_texture *ir, fs_reg dst, fs_reg coordinate, break; case ir_tg4: if (has_nonconstant_offset) { - if (ir->shadow_comparitor) + if (shadow_c.file != BAD_FILE) no16("Gen7 does not support gather4_po_c in SIMD16 mode."); /* More crazy intermixing */ |