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

nir: Create sampler variables in prog_to_nir.

Browse source 
This is needed for nir_gather_info to actually count the textures,
since it operates solely on variables.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Kenneth Graunke 2018-08-24 16:40:19 -07:00
parent ed169c9ad2
commit 1c0f92d8a8
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/program/prog_to_nir.c
View file

@ -52,6 +52,7 @@ struct ptn_compile {
nir_variable *parameters; nir_variable *parameters;
nir_variable *input_vars[VARYING_SLOT_MAX]; nir_variable *input_vars[VARYING_SLOT_MAX];
nir_variable *output_vars[VARYING_SLOT_MAX]; nir_variable *output_vars[VARYING_SLOT_MAX];
nir_variable *sampler_vars[32]; /* matches number of bits in TexSrcUnit */
nir_register **output_regs; nir_register **output_regs;
nir_register **temp_regs; nir_register **temp_regs;
@ -484,9 +485,10 @@ ptn_kil(nir_builder *b, nir_ssa_def **src)
} }
static void static void
ptn_tex(nir_builder *b, nir_alu_dest dest, nir_ssa_def **src, ptn_tex(struct ptn_compile *c, nir_alu_dest dest, nir_ssa_def **src,
struct prog_instruction *prog_inst) struct prog_instruction *prog_inst)
{ {
nir_builder *b = &c->build;
nir_tex_instr *instr; nir_tex_instr *instr;
nir_texop op; nir_texop op;
unsigned num_srcs; unsigned num_srcs;
@ -568,6 +570,15 @@ ptn_tex(nir_builder *b, nir_alu_dest dest, nir_ssa_def **src,
unreachable("can't reach"); unreachable("can't reach");
} }
if (!c->sampler_vars[prog_inst->TexSrcUnit]) {
const struct glsl_type *type =
glsl_sampler_type(instr->sampler_dim, false, false, GLSL_TYPE_FLOAT);
nir_variable *var =
nir_variable_create(b->shader, nir_var_uniform, type, "sampler");
var->data.binding = prog_inst->TexSrcUnit;
c->sampler_vars[prog_inst->TexSrcUnit] = var;
}
unsigned src_number = 0; unsigned src_number = 0;
instr->src[src_number].src = instr->src[src_number].src =
@ -784,7 +795,7 @@ ptn_emit_instruction(struct ptn_compile *c, struct prog_instruction *prog_inst)
case OPCODE_TXD: case OPCODE_TXD:
case OPCODE_TXL: case OPCODE_TXL:
case OPCODE_TXP: case OPCODE_TXP:
ptn_tex(b, dest, src, prog_inst); ptn_tex(c, dest, src, prog_inst);
break; break;
case OPCODE_SWZ: case OPCODE_SWZ: