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

zink: zink_shader_free -> zink_gfx_shader_free

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22577>
This commit is contained in:
Mike Blumenkrantz
2023-03-29 08:50:43 -04:00
committed by Marge Bot
parent 9bf4db8ebb
commit 9f6eec03e0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4968,7 +4968,7 @@ zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr)
} }
void void
zink_shader_free(struct zink_screen *screen, struct zink_shader *shader) zink_gfx_shader_free(struct zink_screen *screen, struct zink_shader *shader)
{ {
assert(shader->info.stage != MESA_SHADER_COMPUTE); assert(shader->info.stage != MESA_SHADER_COMPUTE);
set_foreach(shader->programs, entry) { set_foreach(shader->programs, entry) {
@@ -5034,7 +5034,7 @@ zink_shader_free(struct zink_screen *screen, struct zink_shader *shader)
if (shader->info.stage == MESA_SHADER_TESS_EVAL && if (shader->info.stage == MESA_SHADER_TESS_EVAL &&
shader->non_fs.generated_tcs) { shader->non_fs.generated_tcs) {
/* automatically destroy generated tcs shaders when tes is destroyed */ /* automatically destroy generated tcs shaders when tes is destroyed */
zink_shader_free(screen, shader->non_fs.generated_tcs); zink_gfx_shader_free(screen, shader->non_fs.generated_tcs);
shader->non_fs.generated_tcs = NULL; shader->non_fs.generated_tcs = NULL;
} }
for (unsigned int i = 0; i < ARRAY_SIZE(shader->non_fs.generated_gs); i++) { for (unsigned int i = 0; i < ARRAY_SIZE(shader->non_fs.generated_gs); i++) {
@@ -5042,7 +5042,7 @@ zink_shader_free(struct zink_screen *screen, struct zink_shader *shader)
if (shader->info.stage != MESA_SHADER_FRAGMENT && if (shader->info.stage != MESA_SHADER_FRAGMENT &&
shader->non_fs.generated_gs[i][j]) { shader->non_fs.generated_gs[i][j]) {
/* automatically destroy generated gs shaders when owner is destroyed */ /* automatically destroy generated gs shaders when owner is destroyed */
zink_shader_free(screen, shader->non_fs.generated_gs[i][j]); zink_gfx_shader_free(screen, shader->non_fs.generated_gs[i][j]);
shader->non_fs.generated_gs[i][j] = NULL; shader->non_fs.generated_gs[i][j] = NULL;
} }
} }

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

@@ -80,7 +80,7 @@ char *
zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr); zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr);
void void
zink_shader_free(struct zink_screen *screen, struct zink_shader *shader); zink_gfx_shader_free(struct zink_screen *screen, struct zink_shader *shader);
VkShaderModule VkShaderModule
zink_shader_tcs_compile(struct zink_screen *screen, struct zink_shader *zs, unsigned patch_vertices); zink_shader_tcs_compile(struct zink_screen *screen, struct zink_shader *zs, unsigned patch_vertices);

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

@@ -1161,7 +1161,7 @@ create_gfx_program_separable(struct zink_context *ctx, struct zink_shader **stag
} }
} }
/* We can do this add after the _mesa_set_adds above because we know the prog->shaders[] are /* We can do this add after the _mesa_set_adds above because we know the prog->shaders[] are
* referenced by the draw state and zink_shader_free() can't be called on them while we're in here. * referenced by the draw state and zink_gfx_shader_free() can't be called on them while we're in here.
*/ */
p_atomic_add(&prog->base.reference.count, refs); p_atomic_add(&prog->base.reference.count, refs);
@@ -1890,7 +1890,7 @@ zink_delete_cs_shader_state(struct pipe_context *pctx, void *cso)
void void
zink_delete_shader_state(struct pipe_context *pctx, void *cso) zink_delete_shader_state(struct pipe_context *pctx, void *cso)
{ {
zink_shader_free(zink_screen(pctx->screen), cso); zink_gfx_shader_free(zink_screen(pctx->screen), cso);
} }
void * void *