[Mesa-dev] [PATCH 08/27] i965: add shader cache support for geometry shaders
Jordan Justen
jordan.l.justen at intel.com
Sat Aug 19 07:44:24 UTC 2017
From: Timothy Arceri <timothy.arceri at collabora.com>
[jordan.l.justen at intel.com: *_cached_program => brw_disk_cache_*_program]
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
src/mesa/drivers/dri/i965/brw_disk_cache.c | 25 +++++++++++++++++++++++++
src/mesa/drivers/dri/i965/brw_gs.c | 23 +++++++++++++++--------
2 files changed, 40 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 b56e561e14..7c9fa845ea 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"
@@ -154,6 +155,7 @@ 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_gs_prog_key gs_key;
struct brw_vs_prog_key vs_key;
switch (stage) {
@@ -165,6 +167,11 @@ 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_GEOMETRY:
+ brw_gs_populate_key(brw, &gs_key);
+ gs_key.program_string_id = 0;
+ gen_shader_sha1(brw, prog, stage, &gs_key, binary_sha1);
+ break;
case MESA_SHADER_FRAGMENT:
brw_wm_populate_key(brw, &wm_key);
wm_key.program_string_id = 0;
@@ -216,6 +223,11 @@ read_and_upload(struct brw_context *brw, struct disk_cache *cache,
SET_UPLOAD_PRAMS(vs, VS, vp)
break;
}
+ case MESA_SHADER_GEOMETRY: {
+ struct brw_program *gp = (struct brw_program *) prog;
+ SET_UPLOAD_PRAMS(gs, GS, gp)
+ break;
+ }
case MESA_SHADER_FRAGMENT: {
struct brw_program *wp = (struct brw_program *) prog;
SET_UPLOAD_PRAMS(wm, FS, wp)
@@ -380,6 +392,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 a3c058fe9c..80ff548328 100644
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -226,14 +226,21 @@ 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->geometry_program;
+ gp->id = key.program_string_id;
+
+ bool success = brw_codegen_gs_prog(brw, gp, &key);
+ assert(success);
+ (void)success;
}
bool
--
2.14.0
More information about the mesa-dev
mailing list