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

i965/fs: Don't pass ir_variable * to emit_sampleid_setup().

Browse source 
gl_SampleID is a built-in variable that always is of type "int".

Suggested by Connor Abbott.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Kenneth Graunke 2014-10-17 12:59:18 -07:00
parent 9ebfb3014e
commit ffe582aa20
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -1505,14 +1505,14 @@ fs_visitor::emit_samplepos_setup()
}
fs_reg *
fs_visitor::emit_sampleid_setup(ir_variable *ir)
fs_visitor::emit_sampleid_setup()
{
assert(stage == MESA_SHADER_FRAGMENT);
brw_wm_prog_key *key = (brw_wm_prog_key*) this->key;
assert(brw->gen >= 6);
this->current_annotation = "compute sample id";
fs_reg *reg = new(this->mem_ctx) fs_reg(this, ir->type);
fs_reg *reg = new(this->mem_ctx) fs_reg(this, glsl_type::int_type);
if (key->compute_sample_id) {
fs_reg t1 = fs_reg(this, glsl_type::int_type);

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

@ -464,7 +464,7 @@ public:
bool is_centroid, bool is_sample);
fs_reg *emit_frontfacing_interpolation();
fs_reg *emit_samplepos_setup();
fs_reg *emit_sampleid_setup(ir_variable *ir);
fs_reg *emit_sampleid_setup();
fs_reg *emit_general_interpolation(ir_variable *ir);
void emit_interpolation_setup_gen4();
void emit_interpolation_setup_gen6();

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

@ -137,7 +137,7 @@ fs_visitor::visit(ir_variable *ir)
if (ir->data.location == SYSTEM_VALUE_SAMPLE_POS) {
reg = emit_samplepos_setup();
} else if (ir->data.location == SYSTEM_VALUE_SAMPLE_ID) {
reg = emit_sampleid_setup(ir);
reg = emit_sampleid_setup();
} else if (ir->data.location == SYSTEM_VALUE_SAMPLE_MASK_IN) {
assert(brw->gen >= 7);
reg = new(mem_ctx)