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

i965: add shader cache support for tess stages

Browse source 
v2:
 * Use MAYBE_UNUSED. (Matt)

[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 2016-11-29 12:25:54 +11:00 • committed by Jordan Justen
parent 5a4afd822f
commit 42383faf51
3 changed files with 70 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/mesa/drivers/dri/i965/brw_disk_cache.c
View file

@ -30,6 +30,7 @@
#include "util/mesa-sha1.h"
#include "brw_context.h"
#include "brw_program.h"
#include "brw_gs.h"
#include "brw_state.h"
#include "brw_vs.h"
@ -120,6 +121,14 @@ read_and_upload(struct brw_context *brw, struct disk_cache *cache,
*/
prog_key.vs.program_string_id = 0;
break;
case MESA_SHADER_TESS_CTRL:
brw_tcs_populate_key(brw, &prog_key.tcs);
prog_key.tcs.program_string_id = 0;
break;
case MESA_SHADER_TESS_EVAL:
brw_tes_populate_key(brw, &prog_key.tes);
prog_key.tes.program_string_id = 0;
break;
case MESA_SHADER_GEOMETRY:
brw_gs_populate_key(brw, &prog_key.gs);
prog_key.gs.program_string_id = 0;
@ -182,6 +191,16 @@ read_and_upload(struct brw_context *brw, struct disk_cache *cache,
cache_id = BRW_CACHE_VS_PROG;
stage_state = &brw->vs.base;
break;
case MESA_SHADER_TESS_CTRL:
prog_key.tcs.program_string_id = brw_program(prog)->id;
cache_id = BRW_CACHE_TCS_PROG;
stage_state = &brw->tcs.base;
break;
case MESA_SHADER_TESS_EVAL:
prog_key.tes.program_string_id = brw_program(prog)->id;
cache_id = BRW_CACHE_TES_PROG;
stage_state = &brw->tes.base;
break;
case MESA_SHADER_GEOMETRY:
prog_key.gs.program_string_id = brw_program(prog)->id;
cache_id = BRW_CACHE_GS_PROG;
@ -287,6 +306,28 @@ brw_disk_cache_write_program(struct brw_context *brw)
MESA_SHADER_VERTEX);
}
prog = brw->ctx._Shader->CurrentProgram[MESA_SHADER_TESS_CTRL];
if (prog && !prog->program_written_to_cache) {
struct brw_tcs_prog_key tcs_key;
brw_tcs_populate_key(brw, &tcs_key);
tcs_key.program_string_id = 0;
write_program_data(brw, prog, &tcs_key, brw->tcs.base.prog_data,
brw->tcs.base.prog_offset, cache,
MESA_SHADER_TESS_CTRL);
}
prog = brw->ctx._Shader->CurrentProgram[MESA_SHADER_TESS_EVAL];
if (prog && !prog->program_written_to_cache) {
struct brw_tes_prog_key tes_key;
brw_tes_populate_key(brw, &tes_key);
tes_key.program_string_id = 0;
write_program_data(brw, prog, &tes_key, brw->tes.base.prog_data,
brw->tes.base.prog_offset, cache,
MESA_SHADER_TESS_EVAL);
}
prog = brw->ctx._Shader->CurrentProgram[MESA_SHADER_GEOMETRY];
if (prog && !prog->program_written_to_cache) {
struct brw_gs_prog_key gs_key;

23
src/mesa/drivers/dri/i965/brw_tcs.c
View file

@ -337,14 +337,21 @@ brw_upload_tcs_prog(struct brw_context *brw)
brw_tcs_populate_key(brw, &key);
if (!brw_search_cache(&brw->cache, BRW_CACHE_TCS_PROG,
&key, sizeof(key),
&stage_state->prog_offset,
&brw->tcs.base.prog_data)) {
bool success = brw_codegen_tcs_prog(brw, tcp, tep, &key);
assert(success);
(void)success;
}
if (brw_search_cache(&brw->cache, BRW_CACHE_TCS_PROG,
&key, sizeof(key),
&stage_state->prog_offset,
&brw->tcs.base.prog_data))
return;
if (brw_disk_cache_upload_program(brw, MESA_SHADER_TESS_CTRL))
return;
tcp = (struct brw_program *) brw->programs[MESA_SHADER_TESS_CTRL];
if (tcp)
tcp->id = key.program_string_id;
MAYBE_UNUSED bool success = brw_codegen_tcs_prog(brw, tcp, tep, &key);
assert(success);
}

22
src/mesa/drivers/dri/i965/brw_tes.c
View file

@ -195,14 +195,20 @@ brw_upload_tes_prog(struct brw_context *brw)
brw_tes_populate_key(brw, &key);
if (!brw_search_cache(&brw->cache, BRW_CACHE_TES_PROG,
&key, sizeof(key),
&stage_state->prog_offset,
&brw->tes.base.prog_data)) {
bool success = brw_codegen_tes_prog(brw, tep, &key);
assert(success);
(void)success;
}
if (brw_search_cache(&brw->cache, BRW_CACHE_TES_PROG,
&key, sizeof(key),
&stage_state->prog_offset,
&brw->tes.base.prog_data))
return;
if (brw_disk_cache_upload_program(brw, MESA_SHADER_TESS_EVAL))
return;
tep = (struct brw_program *) brw->programs[MESA_SHADER_TESS_EVAL];
tep->id = key.program_string_id;
MAYBE_UNUSED bool success = brw_codegen_tes_prog(brw, tep, &key);
assert(success);
}