fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-21 16:30:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

lima: upload the shader to a BO at shader creation

Browse source 
No need to conditionally upload later.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9089>
This commit is contained in:
Eric Anholt 2021-02-16 12:49:01 -08:00 • committed by Marge Bot
parent 5a550c8dc7
commit 4ac3f85054
1 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/gallium/drivers/lima/lima_program.c
View file

@ -300,6 +300,16 @@ lima_fs_compile_shader(struct lima_context *ctx,
fs->uses_discard = nir->info.fs.uses_discard;
ralloc_free(nir);
fs->bo = lima_bo_create(screen, fs->shader_size, 0);
if (!fs->bo) {
fprintf(stderr, "lima: create fs shader bo fail\n");
return false;
}
memcpy(lima_bo_map(fs->bo), fs->shader, fs->shader_size);
ralloc_free(fs->shader);
fs->shader = NULL;
return true;
}
@ -387,6 +397,18 @@ lima_vs_compile_shader(struct lima_context *ctx,
}
ralloc_free(nir);
struct lima_screen *screen = lima_screen(ctx->base.screen);
vs->bo = lima_bo_create(screen, vs->shader_size, 0);
if (!vs->bo) {
fprintf(stderr, "lima: create vs shader bo fail\n");
return false;
}
memcpy(lima_bo_map(vs->bo), vs->shader, vs->shader_size);
ralloc_free(vs->shader);
vs->shader = NULL;
return true;
}
@ -440,19 +462,6 @@ lima_update_vs_state(struct lima_context *ctx)
ctx->vs = vs;
if (!vs->bo) {
struct lima_screen *screen = lima_screen(ctx->base.screen);
vs->bo = lima_bo_create(screen, vs->shader_size, 0);
if (!vs->bo) {
fprintf(stderr, "lima: create vs shader bo fail\n");
return false;
}
memcpy(lima_bo_map(vs->bo), vs->shader, vs->shader_size);
ralloc_free(vs->shader);
vs->shader = NULL;
}
if (ctx->vs != old_vs)
ctx->dirty |= LIMA_CONTEXT_DIRTY_COMPILED_VS;
@ -523,19 +532,6 @@ lima_update_fs_state(struct lima_context *ctx)
ctx->fs = fs;
if (!fs->bo) {
struct lima_screen *screen = lima_screen(ctx->base.screen);
fs->bo = lima_bo_create(screen, fs->shader_size, 0);
if (!fs->bo) {
fprintf(stderr, "lima: create fs shader bo fail\n");
return false;
}
memcpy(lima_bo_map(fs->bo), fs->shader, fs->shader_size);
ralloc_free(fs->shader);
fs->shader = NULL;
}
if (ctx->fs != old_fs)
ctx->dirty |= LIMA_CONTEXT_DIRTY_COMPILED_FS;