fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 19:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/fs: Make swizzle_result() not use ir_texture.

Browse source 
Our new IR won't have ir_texture objects.

Signed-off-by: Connor Abbott <connor.abbott@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
This commit is contained in:
Connor Abbott 2014-08-01 18:05:37 -07:00 • committed by Kenneth Graunke
parent cf94dfdb96
commit 12d9a8cd86
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/i965/brw_fs.h
View file

@ -335,7 +335,8 @@ public:
void visit(ir_end_primitive *);
uint32_t gather_channel(ir_texture *ir, uint32_t sampler);
void swizzle_result(ir_texture *ir, fs_reg orig_val, uint32_t sampler);
void swizzle_result(ir_texture_opcode op, int dest_components,
fs_reg orig_val, uint32_t sampler);
fs_inst *emit(fs_inst *inst);
void emit(exec_list list);

2
src/mesa/drivers/dri/i965/brw_fs_fp.cpp
View file

@ -497,7 +497,7 @@ fs_visitor::emit_fragment_program_code()
inst->shadow_compare = fpi->TexShadow;
/* Reuse the GLSL swizzle_result() handler. */
swizzle_result(ir, dst, fpi->TexSrcUnit);
swizzle_result(ir->op, 4, dst, fpi->TexSrcUnit);
dst = this->result;
break;

12
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
View file

@ -2055,7 +2055,7 @@ fs_visitor::visit(ir_texture *ir)
emit_gen6_gather_wa(tex->gen6_gather_wa[sampler], dst);
}
swizzle_result(ir, dst, sampler);
swizzle_result(ir->op, ir->type->vector_elements, dst, sampler);
}
/**
@ -2121,9 +2121,10 @@ fs_visitor::gather_channel(ir_texture *ir, uint32_t sampler)
* EXT_texture_swizzle as well as DEPTH_TEXTURE_MODE for shadow comparisons.
*/
void
fs_visitor::swizzle_result(ir_texture *ir, fs_reg orig_val, uint32_t sampler)
fs_visitor::swizzle_result(ir_texture_opcode op, int dest_components,
fs_reg orig_val, uint32_t sampler)
{
if (ir->op == ir_query_levels) {
if (op == ir_query_levels) {
/* # levels is in .w */
this->result = offset(orig_val, 3);
return;
@ -2134,7 +2135,7 @@ fs_visitor::swizzle_result(ir_texture *ir, fs_reg orig_val, uint32_t sampler)
/* txs,lod don't actually sample the texture, so swizzling the result
* makes no sense.
*/
if (ir->op == ir_txs || ir->op == ir_lod || ir->op == ir_tg4)
if (op == ir_txs || op == ir_lod || op == ir_tg4)
return;
const struct brw_sampler_prog_key_data *tex =
@ -2142,9 +2143,8 @@ fs_visitor::swizzle_result(ir_texture *ir, fs_reg orig_val, uint32_t sampler)
&((brw_wm_prog_key*) this->key)->tex : NULL;
assert(tex);
if (ir->type == glsl_type::float_type) {
if (dest_components == 1) {
/* Ignore DEPTH_TEXTURE_MODE swizzling. */
assert(ir->sampler->type->sampler_shadow);
} else if (tex->swizzles[sampler] != SWIZZLE_NOOP) {
fs_reg swizzled_result = fs_reg(this, glsl_type::vec4_type);
swizzled_result.type = orig_val.type;