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

anv/pipeline: Set tess IO read/written key fields in compile_*

Browse Source 
We want these to be set as close to the final compile as possible so
that they are guaranteed to happen after nir_shader_gather_info is
called.  The next commit is going to move nir_shader_gather_info to
after the linking step which makes this necessary.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Jason Ekstrand
2018-08-07 16:21:13 -07:00
parent 2e4094cd8f
commit f210a5f4bb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/intel/vulkan/anv_pipeline.c
View File

@@ -644,19 +644,10 @@ anv_pipeline_link_tcs(const struct brw_compiler *compiler,
*/ */
tcs_stage->key.tcs.tes_primitive_mode = tcs_stage->key.tcs.tes_primitive_mode =
tes_stage->nir->info.tess.primitive_mode; tes_stage->nir->info.tess.primitive_mode;
tcs_stage->key.tcs.outputs_written =
tcs_stage->nir->info.outputs_written;
tcs_stage->key.tcs.patch_outputs_written =
tcs_stage->nir->info.patch_outputs_written;
tcs_stage->key.tcs.quads_workaround = tcs_stage->key.tcs.quads_workaround =
compiler->devinfo->gen < 9 && compiler->devinfo->gen < 9 &&
tes_stage->nir->info.tess.primitive_mode == 7 /* GL_QUADS */ && tes_stage->nir->info.tess.primitive_mode == 7 /* GL_QUADS */ &&
tes_stage->nir->info.tess.spacing == TESS_SPACING_EQUAL; tes_stage->nir->info.tess.spacing == TESS_SPACING_EQUAL;
tes_stage->key.tes.inputs_read =
tcs_stage->nir->info.outputs_written;
tes_stage->key.tes.patch_inputs_read =
tcs_stage->nir->info.patch_outputs_written;
} }
static const unsigned * static const unsigned *
@@ -665,6 +656,11 @@ anv_pipeline_compile_tcs(const struct brw_compiler *compiler,
struct anv_pipeline_stage *tcs_stage, struct anv_pipeline_stage *tcs_stage,
struct anv_pipeline_stage *prev_stage) struct anv_pipeline_stage *prev_stage)
{ {
tcs_stage->key.tcs.outputs_written =
tcs_stage->nir->info.outputs_written;
tcs_stage->key.tcs.patch_outputs_written =
tcs_stage->nir->info.patch_outputs_written;
return brw_compile_tcs(compiler, NULL, mem_ctx, &tcs_stage->key.tcs, return brw_compile_tcs(compiler, NULL, mem_ctx, &tcs_stage->key.tcs,
&tcs_stage->prog_data.tcs, tcs_stage->nir, &tcs_stage->prog_data.tcs, tcs_stage->nir,
-1, NULL); -1, NULL);
@@ -687,6 +683,11 @@ anv_pipeline_compile_tes(const struct brw_compiler *compiler,
struct anv_pipeline_stage *tes_stage, struct anv_pipeline_stage *tes_stage,
struct anv_pipeline_stage *tcs_stage) struct anv_pipeline_stage *tcs_stage)
{ {
tes_stage->key.tes.inputs_read =
tcs_stage->nir->info.outputs_written;
tes_stage->key.tes.patch_inputs_read =
tcs_stage->nir->info.patch_outputs_written;
return brw_compile_tes(compiler, NULL, mem_ctx, &tes_stage->key.tes, return brw_compile_tes(compiler, NULL, mem_ctx, &tes_stage->key.tes,
&tcs_stage->prog_data.tcs.base.vue_map, &tcs_stage->prog_data.tcs.base.vue_map,
&tes_stage->prog_data.tes, tes_stage->nir, &tes_stage->prog_data.tes, tes_stage->nir,