summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2014-10-15 10:41:04 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2015-01-15 07:18:59 -0800
commitc2ded36bb60d3dfad0036dac7adbf7718968ccf2 (patch)
treed90114671e45a641948dd3cbbfd65021ea92d6ca
parentae2880d131e3197114940fc7028397079840f97d (diff)
i965/fs_nir: Make the sampler register always unsigned
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_nir.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 91c1ffcc34a..6d1fbf6a354 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -1540,7 +1540,7 @@ void
fs_visitor::nir_emit_texture(nir_tex_instr *instr)
{
brw_wm_prog_key *key = (brw_wm_prog_key*) this->key;
- int sampler = instr->sampler_index;
+ unsigned sampler = instr->sampler_index;
/* FINISHME: We're failing to recompile our programs when the sampler is
* updated. This only matters for the texture rectangle scale parameters
@@ -1582,7 +1582,7 @@ fs_visitor::nir_emit_texture(nir_tex_instr *instr)
lod = src;
break;
case nir_tex_src_ms_index:
- sample_index = src;
+ sample_index = retype(src, BRW_REGISTER_TYPE_UD);
break;
case nir_tex_src_offset:
offset = src;