diff options
| author | Jason Ekstrand <[email protected]> | 2015-11-02 17:58:29 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-09 15:00:17 -0800 |
| commit | 5ec456375e4fdd0b6c7d797f99191044e19ead74 (patch) | |
| tree | c34b2d2e4560f516ef3ab10bd798a6a3b7c469c1 /src/gallium | |
| parent | ee85014b90af1d94d637ec763a803479e9bac5dc (diff) | |
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 texture deref
and leaves the sampler deref alone as it did before and nir_lower_samplers
assumes this. Backends can still assume that they are combined and only
look at only at the texture index. Or, if they wish, they can assume that
they are separate because nir_lower_samplers, tgsi_to_nir, and prog_to_nir
all set both texture and sampler index whenever a sampler is required (the
two indices are the same in this case).
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index 8cd8ea4cb66..b71917618c1 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -1310,6 +1310,7 @@ ttn_tex(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src) assert(tgsi_inst->Src[samp].Register.File == TGSI_FILE_SAMPLER); instr->texture_index = tgsi_inst->Src[samp].Register.Index; + instr->sampler_index = tgsi_inst->Src[samp].Register.Index; /* TODO if we supported any opc's which take an explicit SVIEW * src, we would use that here instead. But for the "legacy" |