From 68eaba7e87edcf966d2b058258b7252f2c9db6b2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 25 Apr 2024 07:34:02 -0400 Subject: [PATCH] zink: reorder precompile_separate_shader_job() in file no functional changes Part-of: --- src/gallium/drivers/zink/zink_program.c | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index d2002053b5e23..363ba4071df4b 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -2145,20 +2145,6 @@ precompile_job(void *data, void *gdata, int thread_index) zink_screen_update_pipeline_cache(screen, &prog->base, true); } -static void -precompile_separate_shader_job(void *data, void *gdata, int thread_index) -{ - struct zink_screen *screen = gdata; - struct zink_shader *zs = data; - - zs->precompile.obj = zink_shader_compile_separate(screen, zs); - if (!screen->info.have_EXT_shader_object) { - struct zink_shader_object objs[ZINK_GFX_SHADER_COUNT] = {0}; - objs[zs->info.stage].mod = zs->precompile.obj.mod; - zs->precompile.gpl = zink_create_gfx_pipeline_separate(screen, objs, zs->precompile.layout, zs->info.stage); - } -} - static void zink_link_gfx_shader(struct pipe_context *pctx, void **shaders) { @@ -2227,6 +2213,20 @@ zink_delete_shader_state(struct pipe_context *pctx, void *cso) zink_gfx_shader_free(zink_screen(pctx->screen), cso); } +static void +precompile_separate_shader_job(void *data, void *gdata, int thread_index) +{ + struct zink_screen *screen = gdata; + struct zink_shader *zs = data; + + zs->precompile.obj = zink_shader_compile_separate(screen, zs); + if (!screen->info.have_EXT_shader_object) { + struct zink_shader_object objs[ZINK_GFX_SHADER_COUNT] = {0}; + objs[zs->info.stage].mod = zs->precompile.obj.mod; + zs->precompile.gpl = zink_create_gfx_pipeline_separate(screen, objs, zs->precompile.layout, zs->info.stage); + } +} + void * zink_create_gfx_shader_state(struct pipe_context *pctx, const struct pipe_shader_state *shader) {