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

zink: remove pipe_stream_output from function params

Browse Source 
this is no longer used at all

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24634>
This commit is contained in:
Mike Blumenkrantz
2023-08-07 13:36:08 -04:00
committed by Marge Bot
parent 3c7f50ba4d
commit bc5ba7b7c4
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/drivers/zink/zink_compiler.c
View File

@@ -5174,8 +5174,7 @@ zink_type_size(const struct glsl_type *type, bool bindless)
} }
struct zink_shader * struct zink_shader *
zink_shader_create(struct zink_screen *screen, struct nir_shader *nir, zink_shader_create(struct zink_screen *screen, struct nir_shader *nir)
const struct pipe_stream_output_info *so_info)
{ {
struct zink_shader *ret = rzalloc(NULL, struct zink_shader); struct zink_shader *ret = rzalloc(NULL, struct zink_shader);
bool have_psiz = false; bool have_psiz = false;
@@ -5403,7 +5402,7 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
if (!nir->info.internal) if (!nir->info.internal)
nir_foreach_shader_out_variable(var, nir) nir_foreach_shader_out_variable(var, nir)
var->data.explicit_xfb_buffer = 0; var->data.explicit_xfb_buffer = 0;
if (so_info && so_info->num_outputs && nir->info.outputs_written) if (nir->xfb_info && nir->xfb_info->output_count && nir->info.outputs_written)
update_so_info(ret, nir, nir->info.outputs_written, have_psiz); update_so_info(ret, nir, nir->info.outputs_written, have_psiz);
else if (have_psiz) { else if (have_psiz) {
bool have_fake_psiz = false; bool have_fake_psiz = false;

3
src/gallium/drivers/zink/zink_compiler.h
View File

@@ -73,8 +73,7 @@ zink_shader_compile(struct zink_screen *screen, bool can_shobj, struct zink_shad
struct zink_shader_object struct zink_shader_object
zink_shader_compile_separate(struct zink_screen *screen, struct zink_shader *zs); zink_shader_compile_separate(struct zink_screen *screen, struct zink_shader *zs);
struct zink_shader * struct zink_shader *
zink_shader_create(struct zink_screen *screen, struct nir_shader *nir, zink_shader_create(struct zink_screen *screen, struct nir_shader *nir);
const struct pipe_stream_output_info *so_info);
char * char *
zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr); zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr);

6
src/gallium/drivers/zink/zink_program.c
View File

@@ -1332,7 +1332,7 @@ precompile_compute_job(void *data, void *gdata, int thread_index)
struct zink_compute_program *comp = data; struct zink_compute_program *comp = data;
struct zink_screen *screen = gdata; struct zink_screen *screen = gdata;
comp->shader = zink_shader_create(screen, comp->nir, NULL); comp->shader = zink_shader_create(screen, comp->nir);
comp->curr = comp->module = CALLOC_STRUCT(zink_shader_module); comp->curr = comp->module = CALLOC_STRUCT(zink_shader_module);
assert(comp->module); assert(comp->module);
comp->module->shobj = false; comp->module->shobj = false;
@@ -2182,7 +2182,7 @@ zink_create_gfx_shader_state(struct pipe_context *pctx, const struct pipe_shader
if (nir->info.uses_bindless) if (nir->info.uses_bindless)
zink_descriptors_init_bindless(zink_context(pctx)); zink_descriptors_init_bindless(zink_context(pctx));
void *ret = zink_shader_create(zink_screen(pctx->screen), nir, &shader->stream_output); void *ret = zink_shader_create(zink_screen(pctx->screen), nir);
if (nir->info.separate_shader && zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB && if (nir->info.separate_shader && zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB &&
(screen->info.have_EXT_shader_object || (screen->info.have_EXT_shader_object ||
@@ -2466,7 +2466,7 @@ zink_set_primitive_emulation_keys(struct zink_context *ctx)
zink_add_inline_uniform(nir, ZINK_INLINE_VAL_FLAT_MASK); zink_add_inline_uniform(nir, ZINK_INLINE_VAL_FLAT_MASK);
zink_add_inline_uniform(nir, ZINK_INLINE_VAL_PV_LAST_VERT); zink_add_inline_uniform(nir, ZINK_INLINE_VAL_PV_LAST_VERT);
ralloc_free(prev_stage); ralloc_free(prev_stage);
struct zink_shader *shader = zink_shader_create(screen, nir, NULL); struct zink_shader *shader = zink_shader_create(screen, nir);
shader->needs_inlining = true; shader->needs_inlining = true;
ctx->gfx_stages[prev_vertex_stage]->non_fs.generated_gs[ctx->gfx_pipeline_state.gfx_prim_mode][zink_prim_type] = shader; ctx->gfx_stages[prev_vertex_stage]->non_fs.generated_gs[ctx->gfx_pipeline_state.gfx_prim_mode][zink_prim_type] = shader;
shader->non_fs.is_generated = true; shader->non_fs.is_generated = true;