AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: pass zink_screen to nir_to_spirv().

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27617>
This commit is contained in:
Daniel Schürmann
2024-03-02 13:32:32 +01:00
committed by Marge Bot
parent 9b1a748b5e
commit e52e8dd02e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View File

@@ -4395,8 +4395,9 @@ get_spacing(enum gl_tess_spacing spacing)
}
struct spirv_shader *
nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_t spirv_version)
nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, const struct zink_screen *screen)
{
const uint32_t spirv_version = screen->spirv_version;
struct spirv_shader *ret = NULL;
struct ntv_context ctx = {0};

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

@@ -47,7 +47,7 @@ struct pipe_stream_output_info;
struct spirv_shader *
nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *so_info,
uint32_t spirv_version);
const struct zink_screen *screen);
void
spirv_shader_delete(struct spirv_shader *s);

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

@@ -3977,7 +3977,7 @@ compile_module(struct zink_screen *screen, struct zink_shader *zs, nir_shader *n
}
struct zink_shader_object obj = {0};
struct spirv_shader *spirv = nir_to_spirv(nir, sinfo, screen->spirv_version);
struct spirv_shader *spirv = nir_to_spirv(nir, sinfo, screen);
if (spirv)
obj = zink_shader_spirv_compile(screen, zs, spirv, can_shobj, pg);