if (tcp) {
if (tcp->compiled_once) {
brw_debug_recompile(brw, MESA_SHADER_TESS_CTRL, tcp->program.Id,
- key->program_string_id, key);
+ &key->base);
}
tcp->compiled_once = true;
}
struct brw_tcs_prog_key *key)
{
const struct gen_device_info *devinfo = &brw->screen->devinfo;
+ const struct brw_compiler *compiler = brw->screen->compiler;
struct brw_program *tcp =
(struct brw_program *) brw->programs[MESA_SHADER_TESS_CTRL];
struct brw_program *tep =
per_patch_slots |= prog->info.patch_outputs_written;
}
- if (devinfo->gen < 8 || !tcp)
+ if (devinfo->gen < 8 || !tcp || compiler->use_tcs_8_patch)
key->input_vertices = brw->ctx.TessCtrlProgram.patch_vertices;
key->outputs_written = per_vertex_slots;
key->patch_outputs_written = per_patch_slots;
tep->program.info.tess.spacing == TESS_SPACING_EQUAL;
if (tcp) {
- key->program_string_id = tcp->id;
-
/* _NEW_TEXTURE */
- brw_populate_sampler_prog_key_data(&brw->ctx, &tcp->program, &key->tex);
+ brw_populate_base_prog_key(&brw->ctx, tcp, &key->base);
}
}
/* BRW_NEW_TESS_PROGRAMS */
struct brw_program *tcp =
(struct brw_program *) brw->programs[MESA_SHADER_TESS_CTRL];
- MAYBE_UNUSED struct brw_program *tep =
+ ASSERTED struct brw_program *tep =
(struct brw_program *) brw->programs[MESA_SHADER_TESS_EVAL];
assert(tep);
tcp = (struct brw_program *) brw->programs[MESA_SHADER_TESS_CTRL];
if (tcp)
- tcp->id = key.program_string_id;
+ tcp->id = key.base.program_string_id;
- MAYBE_UNUSED bool success = brw_codegen_tcs_prog(brw, tcp, tep, &key);
+ ASSERTED bool success = brw_codegen_tcs_prog(brw, tcp, tep, &key);
assert(success);
}
memset(key, 0, sizeof(*key));
- key->program_string_id = btcp->id;
- brw_setup_tex_for_precompile(devinfo, &key->tex, prog);
+ brw_populate_default_base_prog_key(devinfo, btcp, &key->base);
/* Guess that the input and output patches have the same dimensionality. */
- if (devinfo->gen < 8)
+ if (devinfo->gen < 8 || compiler->use_tcs_8_patch)
key->input_vertices = prog->info.tess.tcs_vertices_out;
if (tes) {