summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2014-10-31 11:29:24 -0700
committerMatt Turner <mattst88@gmail.com>2014-11-06 11:09:46 -0800
commit497122a338e8a259abb43a71e79c1475fd44ce65 (patch)
tree8ea7864393e1b9ccd9b7b495311924b967830c19
parent7e19e6c877714e05e65ca2cecd1c782fdc260cb6 (diff)
i965/fs: Remove force uncompressed stack.
Last use was in shader_time. Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp17
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.h5
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_visitor.cpp5
3 files changed, 0 insertions, 27 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 1e3396c98b7..39c6231b5c1 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -742,7 +742,6 @@ fs_visitor::emit_shader_time_end()
test->conditional_mod = BRW_CONDITIONAL_Z;
emit(IF(BRW_PREDICATE_NORMAL));
- push_force_uncompressed();
fs_reg start = shader_start_time;
start.negate = true;
fs_reg diff = fs_reg(GRF, virtual_grf_alloc(1), BRW_REGISTER_TYPE_UD, 1);
@@ -759,8 +758,6 @@ fs_visitor::emit_shader_time_end()
emit(BRW_OPCODE_ELSE);
emit_shader_time_write(reset_type, fs_reg(1u));
emit(BRW_OPCODE_ENDIF);
-
- pop_force_uncompressed();
}
void
@@ -882,19 +879,6 @@ fs_visitor::emit(enum opcode opcode, const fs_reg &dst,
return emit(new(mem_ctx) fs_inst(opcode, dst, src, sources));
}
-void
-fs_visitor::push_force_uncompressed()
-{
- force_uncompressed_stack++;
-}
-
-void
-fs_visitor::pop_force_uncompressed()
-{
- force_uncompressed_stack--;
- assert(force_uncompressed_stack >= 0);
-}
-
/**
* Returns true if the instruction has a flag that means it won't
* update an entire destination register.
@@ -3641,7 +3625,6 @@ fs_visitor::run()
}
}
}
- assert(force_uncompressed_stack == 0);
/* This must come after all optimization and register allocation, since
* it inserts dead code that happens to have side effects, and it does
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 67956bc3113..d9150c31053 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -453,9 +453,6 @@ public:
void lower_uniform_pull_constant_loads();
bool lower_load_payload();
- void push_force_uncompressed();
- void pop_force_uncompressed();
-
void emit_dummy_fs();
void emit_repclear_shader();
fs_reg *emit_fragcoord_interpolation(ir_variable *ir);
@@ -680,8 +677,6 @@ public:
bool spilled_any_registers;
const unsigned dispatch_width; /**< 8 or 16 */
-
- int force_uncompressed_stack;
};
/**
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 3fc9e39484a..4e1badda21f 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -2921,9 +2921,6 @@ fs_visitor::emit_untyped_surface_read(unsigned surf_index, fs_reg dst,
fs_inst *
fs_visitor::emit(fs_inst *inst)
{
- if (force_uncompressed_stack > 0)
- inst->exec_size = 8;
-
if (dispatch_width == 16 && inst->exec_size == 8)
inst->force_uncompressed = true;
@@ -3469,8 +3466,6 @@ fs_visitor::init()
this->pull_constant_loc = NULL;
this->push_constant_loc = NULL;
- this->force_uncompressed_stack = 0;
-
this->spilled_any_registers = false;
this->do_dual_src = false;