OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/ptn: Use nir_variable_create

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5966>
This commit is contained in:
Jason Ekstrand
2020-07-21 12:09:28 -05:00
committed by Marge Bot
parent e5536e4a78
commit a41a84d362
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/program/prog_to_nir.c
View File

@@ -913,22 +913,21 @@ setup_registers_and_variables(struct ptn_compile *c)
nir_register *reg = nir_local_reg_create(b->impl); nir_register *reg = nir_local_reg_create(b->impl);
reg->num_components = 4; reg->num_components = 4;
nir_variable *var = rzalloc(shader, nir_variable); const struct glsl_type *type;
if ((c->prog->Target == GL_FRAGMENT_PROGRAM_ARB && i == FRAG_RESULT_DEPTH) || if ((c->prog->Target == GL_FRAGMENT_PROGRAM_ARB && i == FRAG_RESULT_DEPTH) ||
(c->prog->Target == GL_VERTEX_PROGRAM_ARB && i == VARYING_SLOT_FOGC) || (c->prog->Target == GL_VERTEX_PROGRAM_ARB && i == VARYING_SLOT_FOGC) ||
(c->prog->Target == GL_VERTEX_PROGRAM_ARB && i == VARYING_SLOT_PSIZ)) (c->prog->Target == GL_VERTEX_PROGRAM_ARB && i == VARYING_SLOT_PSIZ))
var->type = glsl_float_type(); type = glsl_float_type();
else else
var->type = glsl_vec4_type(); type = glsl_vec4_type();
var->data.mode = nir_var_shader_out;
var->name = ralloc_asprintf(var, "out_%d", i);
nir_variable *var =
nir_variable_create(shader, nir_var_shader_out, type,
ralloc_asprintf(shader, "out_%d", i));
var->data.location = i; var->data.location = i;
var->data.index = 0; var->data.index = 0;
c->output_regs[i] = reg; c->output_regs[i] = reg;
exec_list_push_tail(&shader->outputs, &var->node);
c->output_vars[i] = var; c->output_vars[i] = var;
} }