nir: Separate texture from sampler in nir_tex_instr
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 3 Nov 2015 01:58:29 +0000 (17:58 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 14 Nov 2015 15:57:31 +0000 (07:57 -0800)
commitb169bb902a5e8dfbae9c49faf599f7771dbbf10a
treea4f3a62c0938147f6393c6ccd6ef62c35a5f6aab
parentf94e1d97381ec787c2abbbcd5265252596217e33
nir: Separate texture from sampler in nir_tex_instr

This commit adds the capability to NIR to support separate textures and
samplers.  As it currently stands, glsl_to_nir only sets the sampler and
leaves the texture alone as it did before and nir_lower_samplers assumes
this.  However, backends can, if they wish, assume that they are separate
because nir_lower_samplers sets both texture and sampler index (they are
the same in this case).
src/glsl/nir/nir.c
src/glsl/nir/nir.h
src/glsl/nir/nir_instr_set.c
src/glsl/nir/nir_lower_samplers.c
src/glsl/nir/nir_print.c
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
src/mesa/program/prog_to_nir.c