diff options
| author | Timothy Arceri <[email protected]> | 2016-10-13 11:41:23 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | e1af20f18a86f52a9640faf2d4ff8a71b0a4fa9b (patch) | |
| tree | 32b4e9dbc9c03aa7733e1e32721d92c3c54571e0 /src/mesa/drivers/dri/i965/brw_tes.c | |
| parent | 094fe3a9591ce200162d955635eee577c13f9324 (diff) | |
nir/i965/anv/radv/gallium: make shader info a pointer
When restoring something from shader cache we won't have and don't
want to create a nir_shader this change detaches the two.
There are other advantages such as being able to reuse the
shader info populated by GLSL IR.
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_tes.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tes.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tes.c b/src/mesa/drivers/dri/i965/brw_tes.c index 5612c46d678..59e4d50f490 100644 --- a/src/mesa/drivers/dri/i965/brw_tes.c +++ b/src/mesa/drivers/dri/i965/brw_tes.c @@ -235,9 +235,9 @@ brw_tes_populate_key(struct brw_context *brw, { uint64_t per_vertex_slots = - brw->tess_eval_program->Base.nir->info.inputs_read; + brw->tess_eval_program->Base.nir->info->inputs_read; uint32_t per_patch_slots = - brw->tess_eval_program->Base.nir->info.patch_inputs_read; + brw->tess_eval_program->Base.nir->info->patch_inputs_read; struct brw_tess_eval_program *tep = (struct brw_tess_eval_program *) brw->tess_eval_program; @@ -253,9 +253,9 @@ brw_tes_populate_key(struct brw_context *brw, */ if (brw->tess_ctrl_program) { per_vertex_slots |= - brw->tess_ctrl_program->Base.nir->info.outputs_written; + brw->tess_ctrl_program->Base.nir->info->outputs_written; per_patch_slots |= - brw->tess_ctrl_program->Base.nir->info.patch_outputs_written; + brw->tess_ctrl_program->Base.nir->info->patch_outputs_written; } /* Ignore gl_TessLevelInner/Outer - we treat them as system values, @@ -316,14 +316,14 @@ brw_tes_precompile(struct gl_context *ctx, memset(&key, 0, sizeof(key)); key.program_string_id = btep->id; - key.inputs_read = prog->nir->info.inputs_read; - key.patch_inputs_read = prog->nir->info.patch_inputs_read; + key.inputs_read = prog->nir->info->inputs_read; + key.patch_inputs_read = prog->nir->info->patch_inputs_read; if (shader_prog->_LinkedShaders[MESA_SHADER_TESS_CTRL]) { struct gl_program *tcp = shader_prog->_LinkedShaders[MESA_SHADER_TESS_CTRL]->Program; - key.inputs_read |= tcp->nir->info.outputs_written; - key.patch_inputs_read |= tcp->nir->info.patch_outputs_written; + key.inputs_read |= tcp->nir->info->outputs_written; + key.patch_inputs_read |= tcp->nir->info->patch_outputs_written; } /* Ignore gl_TessLevelInner/Outer - they're system values. */ |