From: Timothy Arceri <timothy.arc...@collabora.com>
v2:
* Use MAYBE_UNUSED. (Matt)
[jordan.l.jus...@intel.com: *_cached_program => brw_disk_cache_*_program]
Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com>
---
src/mesa/drivers/dri/i965/brw_disk_cache.c | 49 ++++++++++++++++++++++++++++++
src/mesa/drivers/dri/i965/brw_tcs.c | 23 +++++++++-----
src/mesa/drivers/dri/i965/brw_tes.c | 22 +++++++++-----
3 files changed, 78 insertions(+), 16 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_disk_cache.c
b/src/mesa/drivers/dri/i965/brw_disk_cache.c
index a16053f4bb..4481189eca 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_program.h"
#include "brw_gs.h"
#include "brw_state.h"
#include "brw_vs.h"
@@ -124,6 +125,8 @@ read_and_upload(struct brw_context *brw, struct disk_cache
*cache,
unsigned char binary_sha1[20];
struct brw_wm_prog_key wm_key;
+ struct brw_tcs_prog_key tcs_key;
+ struct brw_tes_prog_key tes_key;
struct brw_gs_prog_key gs_key;
struct brw_vs_prog_key vs_key;
@@ -136,6 +139,16 @@ read_and_upload(struct brw_context *brw, struct disk_cache
*cache,
vs_key.program_string_id = 0;
gen_shader_sha1(brw, prog, stage, &vs_key, binary_sha1);
break;
+ case MESA_SHADER_TESS_CTRL:
+ brw_tcs_populate_key(brw, &tcs_key);
+ tcs_key.program_string_id = 0;
+ gen_shader_sha1(brw, prog, stage, &tcs_key, binary_sha1);
+ break;
+ case MESA_SHADER_TESS_EVAL:
+ brw_tes_populate_key(brw, &tes_key);
+ tes_key.program_string_id = 0;
+ gen_shader_sha1(brw, prog, stage, &tes_key, binary_sha1);
+ break;
case MESA_SHADER_GEOMETRY:
brw_gs_populate_key(brw, &gs_key);
gs_key.program_string_id = 0;
@@ -196,6 +209,16 @@ read_and_upload(struct brw_context *brw, struct disk_cache
*cache,
SET_UPLOAD_PRAMS(vs, VS, vp)
break;
}
+ case MESA_SHADER_TESS_CTRL: {
+ struct brw_program *tcp = (struct brw_program *) prog;
+ SET_UPLOAD_PRAMS(tcs, TCS, tcp)
+ break;
+ }
+ case MESA_SHADER_TESS_EVAL: {
+ struct brw_program *tep = (struct brw_program *) prog;
+ SET_UPLOAD_PRAMS(tes, TES, tep)
+ break;
+ }
case MESA_SHADER_GEOMETRY: {
struct brw_program *gp = (struct brw_program *) prog;
SET_UPLOAD_PRAMS(gs, GS, gp)
@@ -354,6 +377,32 @@ 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_data->program_size,
+ sizeof(struct brw_tcs_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_data->program_size,
+ sizeof(struct brw_tes_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;
diff --git a/src/mesa/drivers/dri/i965/brw_tcs.c
b/src/mesa/drivers/dri/i965/brw_tcs.c
index 6c9cb153d3..3ee6a59d41 100644
--- a/src/mesa/drivers/dri/i965/brw_tcs.c
+++ b/src/mesa/drivers/dri/i965/brw_tcs.c
@@ -339,14 +339,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);
}
diff --git a/src/mesa/drivers/dri/i965/brw_tes.c
b/src/mesa/drivers/dri/i965/brw_tes.c
index 47f3b510a5..0788296e5d 100644
--- a/src/mesa/drivers/dri/i965/brw_tes.c
+++ b/src/mesa/drivers/dri/i965/brw_tes.c
@@ -197,14 +197,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);
}
--
2.15.0.rc0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
