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

anv/pipeline: Drop anv_fill_binding_table

Browse Source 
We zero out the prog data anyway and, now that bias is always zero, this
function is accomplishing nothing.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:
Jason Ekstrand
2019-03-02 01:33:39 -06:00
committed by Jason Ekstrand
parent 65ee5cc0da
commit 0010d0348a
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,24 +611,11 @@ anv_pipeline_lower_nir(struct anv_pipeline *pipeline,
stage->nir = nir; stage->nir = nir;
} }
static void
anv_fill_binding_table(struct brw_stage_prog_data *prog_data, unsigned bias)
{
prog_data->binding_table.size_bytes = 0;
prog_data->binding_table.texture_start = bias;
prog_data->binding_table.gather_texture_start = bias;
prog_data->binding_table.ubo_start = bias;
prog_data->binding_table.ssbo_start = bias;
prog_data->binding_table.image_start = bias;
}
static void static void
anv_pipeline_link_vs(const struct brw_compiler *compiler, anv_pipeline_link_vs(const struct brw_compiler *compiler,
struct anv_pipeline_stage *vs_stage, struct anv_pipeline_stage *vs_stage,
struct anv_pipeline_stage *next_stage) struct anv_pipeline_stage *next_stage)
{ {
anv_fill_binding_table(&vs_stage->prog_data.vs.base.base, 0);
if (next_stage) if (next_stage)
brw_nir_link_shaders(compiler, &vs_stage->nir, &next_stage->nir); brw_nir_link_shaders(compiler, &vs_stage->nir, &next_stage->nir);
} }
@@ -693,8 +680,6 @@ anv_pipeline_link_tcs(const struct brw_compiler *compiler,
{ {
assert(tes_stage && tes_stage->stage == MESA_SHADER_TESS_EVAL); assert(tes_stage && tes_stage->stage == MESA_SHADER_TESS_EVAL);
anv_fill_binding_table(&tcs_stage->prog_data.tcs.base.base, 0);
brw_nir_link_shaders(compiler, &tcs_stage->nir, &tes_stage->nir); brw_nir_link_shaders(compiler, &tcs_stage->nir, &tes_stage->nir);
nir_lower_patch_vertices(tes_stage->nir, nir_lower_patch_vertices(tes_stage->nir,
@@ -704,9 +689,6 @@ anv_pipeline_link_tcs(const struct brw_compiler *compiler,
/* Copy TCS info into the TES info */ /* Copy TCS info into the TES info */
merge_tess_info(&tes_stage->nir->info, &tcs_stage->nir->info); merge_tess_info(&tes_stage->nir->info, &tcs_stage->nir->info);
anv_fill_binding_table(&tcs_stage->prog_data.tcs.base.base, 0);
anv_fill_binding_table(&tes_stage->prog_data.tes.base.base, 0);
/* Whacking the key after cache lookup is a bit sketchy, but all of /* Whacking the key after cache lookup is a bit sketchy, but all of
* this comes from the SPIR-V, which is part of the hash used for the * this comes from the SPIR-V, which is part of the hash used for the
* pipeline cache. So it should be safe. * pipeline cache. So it should be safe.
@@ -740,8 +722,6 @@ anv_pipeline_link_tes(const struct brw_compiler *compiler,
struct anv_pipeline_stage *tes_stage, struct anv_pipeline_stage *tes_stage,
struct anv_pipeline_stage *next_stage) struct anv_pipeline_stage *next_stage)
{ {
anv_fill_binding_table(&tes_stage->prog_data.tes.base.base, 0);
if (next_stage) if (next_stage)
brw_nir_link_shaders(compiler, &tes_stage->nir, &next_stage->nir); brw_nir_link_shaders(compiler, &tes_stage->nir, &next_stage->nir);
} }
@@ -768,8 +748,6 @@ anv_pipeline_link_gs(const struct brw_compiler *compiler,
struct anv_pipeline_stage *gs_stage, struct anv_pipeline_stage *gs_stage,
struct anv_pipeline_stage *next_stage) struct anv_pipeline_stage *next_stage)
{ {
anv_fill_binding_table(&gs_stage->prog_data.gs.base.base, 0);
if (next_stage) if (next_stage)
brw_nir_link_shaders(compiler, &gs_stage->nir, &next_stage->nir); brw_nir_link_shaders(compiler, &gs_stage->nir, &next_stage->nir);
} }
@@ -880,8 +858,6 @@ anv_pipeline_link_fs(const struct brw_compiler *compiler,
typed_memcpy(stage->bind_map.surface_to_descriptor, typed_memcpy(stage->bind_map.surface_to_descriptor,
rt_bindings, num_rts); rt_bindings, num_rts);
stage->bind_map.surface_count += num_rts; stage->bind_map.surface_count += num_rts;
anv_fill_binding_table(&stage->prog_data.wm.base, 0);
} }
static const unsigned * static const unsigned *
@@ -1240,8 +1216,6 @@ anv_pipeline_compile_cs(struct anv_pipeline *pipeline,
NIR_PASS_V(stage.nir, anv_nir_add_base_work_group_id, NIR_PASS_V(stage.nir, anv_nir_add_base_work_group_id,
&stage.prog_data.cs); &stage.prog_data.cs);
anv_fill_binding_table(&stage.prog_data.cs.base, 0);
const unsigned *shader_code = const unsigned *shader_code =
brw_compile_cs(compiler, NULL, mem_ctx, &stage.key.cs, brw_compile_cs(compiler, NULL, mem_ctx, &stage.key.cs,
&stage.prog_data.cs, stage.nir, -1, NULL); &stage.prog_data.cs, stage.nir, -1, NULL);