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

nir: Rename nir_gather_xfb_info to nir_shader_get_xfb_info

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16750>
This commit is contained in:
Jason Ekstrand
2022-05-17 10:56:52 -05:00
committed by Marge Bot
parent f812cc0fe6
commit 3e04432b3a
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/vulkan/radv_pipeline.c
View File

@@ -2816,7 +2816,7 @@ radv_nir_stage_uses_xfb(const nir_shader *nir)
if (nir->info.stage == MESA_SHADER_MESH)
return false;
nir_xfb_info *xfb = nir_gather_xfb_info(nir, NULL);
nir_xfb_info *xfb = nir_shader_get_xfb_info(nir, NULL);
bool uses_xfb = !!xfb;
ralloc_free(xfb);

2
src/amd/vulkan/radv_shader_info.c
View File

@@ -399,7 +399,7 @@ gather_info_output_decl(const nir_shader *nir, const nir_variable *var,
static void
gather_xfb_info(const nir_shader *nir, struct radv_shader_info *info)
{
nir_xfb_info *xfb = nir_gather_xfb_info(nir, NULL);
nir_xfb_info *xfb = nir_shader_get_xfb_info(nir, NULL);
struct radv_streamout_info *so = &info->so;
if (!xfb)

2
src/compiler/nir/nir_gather_xfb_info.c
View File

@@ -179,7 +179,7 @@ compare_xfb_output_offsets(const void *_a, const void *_b)
}
nir_xfb_info *
nir_gather_xfb_info(const nir_shader *shader, void *mem_ctx)
nir_shader_get_xfb_info(const nir_shader *shader, void *mem_ctx)
{
return nir_gather_xfb_info_with_varyings(shader, mem_ctx, NULL);
}

2
src/compiler/nir/nir_xfb_info.h
View File

@@ -75,7 +75,7 @@ nir_xfb_info_size(uint16_t output_count)
}
nir_xfb_info *
nir_gather_xfb_info(const nir_shader *shader, void *mem_ctx);
nir_shader_get_xfb_info(const nir_shader *shader, void *mem_ctx);
nir_xfb_info *
nir_gather_xfb_info_with_varyings(const nir_shader *shader,

2
src/freedreno/vulkan/tu_shader.c
View File

@@ -661,7 +661,7 @@ shared_type_info(const struct glsl_type *type, unsigned *size, unsigned *align)
static void
tu_gather_xfb_info(nir_shader *nir, struct ir3_stream_output_info *info)
{
nir_xfb_info *xfb = nir_gather_xfb_info(nir, NULL);
nir_xfb_info *xfb = nir_shader_get_xfb_info(nir, NULL);
if (!xfb)
return;

2
src/gallium/frontends/lavapipe/lvp_pipeline.c
View File

@@ -1121,7 +1121,7 @@ lvp_pipeline_compile(struct lvp_pipeline *pipeline,
if (stage == MESA_SHADER_VERTEX ||
stage == MESA_SHADER_GEOMETRY ||
stage == MESA_SHADER_TESS_EVAL) {
nir_xfb_info *xfb_info = nir_gather_xfb_info(pipeline->pipeline_nir[stage], NULL);
nir_xfb_info *xfb_info = nir_shader_get_xfb_info(pipeline->pipeline_nir[stage], NULL);
if (xfb_info) {
uint8_t output_mapping[VARYING_SLOT_TESS_MAX];
memset(output_mapping, 0, sizeof(output_mapping));

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

@@ -1774,7 +1774,7 @@ anv_pipeline_compile_graphics(struct anv_graphics_pipeline *pipeline,
if (s == MESA_SHADER_VERTEX ||
s == MESA_SHADER_TESS_EVAL ||
s == MESA_SHADER_GEOMETRY)
xfb_info = nir_gather_xfb_info(stages[s].nir, stage_ctx);
xfb_info = nir_shader_get_xfb_info(stages[s].nir, stage_ctx);
switch (s) {
case MESA_SHADER_VERTEX: