i965/nir: add a helper to lower gl_PatchVerticesIn to a uniform

v2: do not try to handle it as a system value directly for the SPIR-V
    path. In GL we rather handle it as a uniform like we do for the
    GLSL path (Jason).

v3:
  - Remove the uniform variable, it is alwats -1 now (Jason)
  - Also do the lowering for the TessEval stage (Jason)

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Iago Toral Quiroga
2018-01-08 09:41:23 +01:00
parent ea227f4322
commit 4317c848b9
2 changed files with 27 additions and 0 deletions

View File

@@ -145,6 +145,8 @@ void brw_nir_setup_arb_uniforms(void *mem_ctx, nir_shader *shader,
struct gl_program *prog,
struct brw_stage_prog_data *stage_prog_data);
void brw_nir_lower_patch_vertices_in_to_uniform(nir_shader *nir);
void brw_nir_analyze_ubo_ranges(const struct brw_compiler *compiler,
nir_shader *nir,
struct brw_ubo_range out_ranges[4]);

View File

@@ -243,3 +243,28 @@ brw_nir_setup_arb_uniforms(void *mem_ctx, nir_shader *shader,
stage_prog_data->param[4 * p + i] = BRW_PARAM_BUILTIN_ZERO;
}
}
void
brw_nir_lower_patch_vertices_in_to_uniform(nir_shader *nir)
{
nir_foreach_variable_safe(var, &nir->system_values) {
if (var->data.location != SYSTEM_VALUE_VERTICES_IN)
continue;
gl_state_index tokens[STATE_LENGTH] = {
STATE_INTERNAL,
nir->info.stage == MESA_SHADER_TESS_CTRL ?
STATE_TCS_PATCH_VERTICES_IN : STATE_TES_PATCH_VERTICES_IN,
};
var->num_state_slots = 1;
var->state_slots =
ralloc_array(var, nir_state_slot, var->num_state_slots);
memcpy(var->state_slots[0].tokens, tokens, sizeof(tokens));
var->state_slots[0].swizzle = SWIZZLE_XXXX;
var->data.mode = nir_var_uniform;
var->data.location = -1;
exec_node_remove(&var->node);
exec_list_push_tail(&nir->uniforms, &var->node);
}
}