From 2589e7ddafb63583498f5f7138914d2a2e634960 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 24 Jan 2017 08:41:36 +1100 Subject: i965: Add shader cache support for vertex and fragment stages 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 Reviewed-by: Jason Ekstrand Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_wm.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_wm.c') diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 34a3a1e5c16..08bacebd571 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -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 -- cgit v1.2.3