fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Add shader cache support for vertex and fragment stages

Browse source 
This enables the cache on vertex and fragment shaders only.

v2:
 * Use MAYBE_UNUSED. (Matt)

[jordan.l.justen@intel.com: reword subject]
[jordan.l.justen@intel.com: *_cached_program => brw_disk_cache_*_program]
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri 2017-01-24 08:41:36 +11:00 • committed by Jordan Justen
parent 516d50db31
commit 2589e7ddaf
3 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_state_upload.c
View file

@ -418,6 +418,8 @@ brw_upload_programs(struct brw_context *brw,
brw_upload_clip_prog(brw);
brw_upload_sf_prog(brw);
}
brw_disk_cache_write_program(brw);
} else if (pipeline == BRW_COMPUTE_PIPELINE) {
brw_upload_cs_prog(brw);
}

20
src/mesa/drivers/dri/i965/brw_vs.c
View file

@ -342,13 +342,19 @@ brw_upload_vs_prog(struct brw_context *brw)
brw_vs_populate_key(brw, &key);
if (!brw_search_cache(&brw->cache, BRW_CACHE_VS_PROG,
&key, sizeof(key),
&brw->vs.base.prog_offset, &brw->vs.base.prog_data)) {
bool success = brw_codegen_vs_prog(brw, vp, &key);
(void) success;
assert(success);
}
if (brw_search_cache(&brw->cache, BRW_CACHE_VS_PROG,
&key, sizeof(key),
&brw->vs.base.prog_offset, &brw->vs.base.prog_data))
return;
if (brw_disk_cache_upload_program(brw, MESA_SHADER_VERTEX))
return;
vp = (struct brw_program *) brw->programs[MESA_SHADER_VERTEX];
vp->id = key.program_string_id;
MAYBE_UNUSED bool success = brw_codegen_vs_prog(brw, vp, &key);
assert(success);
}
bool

24
src/mesa/drivers/dri/i965/brw_wm.c
View file

@ -595,15 +595,21 @@ brw_upload_wm_prog(struct brw_context *brw)
brw_wm_populate_key(brw, &key);
if (!brw_search_cache(&brw->cache, BRW_CACHE_FS_PROG,
&key, sizeof(key),
&brw->wm.base.prog_offset,
&brw->wm.base.prog_data)) {
bool success = brw_codegen_wm_prog(brw, fp, &key,
&brw->vue_map_geom_out);
(void) success;
assert(success);
}
if (brw_search_cache(&brw->cache, BRW_CACHE_FS_PROG,
&key, sizeof(key),
&brw->wm.base.prog_offset,
&brw->wm.base.prog_data))
return;
if (brw_disk_cache_upload_program(brw, MESA_SHADER_FRAGMENT))
return;
fp = (struct brw_program *) brw->programs[MESA_SHADER_FRAGMENT];
fp->id = key.program_string_id;
MAYBE_UNUSED bool success = brw_codegen_wm_prog(brw, fp, &key,
&brw->vue_map_geom_out);
assert(success);
}
bool