From: Timothy Arceri <[email protected]> v2: * Use MAYBE_UNUSED. (Matt)
[[email protected]: *_cached_program => brw_disk_cache_*_program] Signed-off-by: Jordan Justen <[email protected]> --- src/mesa/drivers/dri/i965/brw_disk_cache.c | 23 +++++++++++++++++++++++ src/mesa/drivers/dri/i965/brw_gs.c | 22 ++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_disk_cache.c b/src/mesa/drivers/dri/i965/brw_disk_cache.c index 186cbe83706..f2a6b8c3e85 100644 --- a/src/mesa/drivers/dri/i965/brw_disk_cache.c +++ b/src/mesa/drivers/dri/i965/brw_disk_cache.c @@ -30,6 +30,7 @@ #include "util/mesa-sha1.h" #include "brw_context.h" +#include "brw_gs.h" #include "brw_state.h" #include "brw_vs.h" #include "brw_wm.h" @@ -127,6 +128,10 @@ read_and_upload(struct brw_context *brw, struct disk_cache *cache, */ prog_key.vs.program_string_id = 0; break; + case MESA_SHADER_GEOMETRY: + brw_gs_populate_key(brw, &prog_key.gs); + prog_key.gs.program_string_id = 0; + break; case MESA_SHADER_FRAGMENT: brw_wm_populate_key(brw, &prog_key.wm); prog_key.wm.program_string_id = 0; @@ -199,6 +204,11 @@ read_and_upload(struct brw_context *brw, struct disk_cache *cache, SET_UPLOAD_PARAMS(vs, VS, vp); break; } + case MESA_SHADER_GEOMETRY: { + struct brw_program *gp = (struct brw_program *) prog; + SET_UPLOAD_PARAMS(gs, GS, gp); + break; + } case MESA_SHADER_FRAGMENT: { struct brw_program *wp = (struct brw_program *) prog; SET_UPLOAD_PARAMS(wm, FS, wp); @@ -314,6 +324,19 @@ brw_disk_cache_write_program(struct brw_context *brw) MESA_SHADER_VERTEX); } + prog = brw->ctx._Shader->CurrentProgram[MESA_SHADER_GEOMETRY]; + if (prog && !prog->program_written_to_cache) { + struct brw_gs_prog_key gs_key; + brw_gs_populate_key(brw, &gs_key); + gs_key.program_string_id = 0; + + write_program_data(brw, prog, &gs_key, brw->gs.base.prog_data, + brw->gs.base.prog_data->program_size, + sizeof(struct brw_gs_prog_data), + brw->gs.base.prog_offset, cache, + MESA_SHADER_GEOMETRY); + } + prog = brw->ctx._Shader->CurrentProgram[MESA_SHADER_FRAGMENT]; if (prog && !prog->program_written_to_cache) { struct brw_wm_prog_key wm_key; diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index e6e757ce686..3f00f4ae2ab 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -193,14 +193,20 @@ brw_upload_gs_prog(struct brw_context *brw) brw_gs_populate_key(brw, &key); - if (!brw_search_cache(&brw->cache, BRW_CACHE_GS_PROG, - &key, sizeof(key), - &stage_state->prog_offset, - &brw->gs.base.prog_data)) { - bool success = brw_codegen_gs_prog(brw, gp, &key); - assert(success); - (void)success; - } + if (brw_search_cache(&brw->cache, BRW_CACHE_GS_PROG, + &key, sizeof(key), + &stage_state->prog_offset, + &brw->gs.base.prog_data)) + return; + + if (brw_disk_cache_upload_program(brw, MESA_SHADER_GEOMETRY)) + return; + + gp = (struct brw_program *) brw->programs[MESA_SHADER_GEOMETRY]; + gp->id = key.program_string_id; + + MAYBE_UNUSED bool success = brw_codegen_gs_prog(brw, gp, &key); + assert(success); } bool -- 2.15.0.rc0 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
