<div dir="ltr"><div class="gmail_extra">I've got a meta-comment and then a couple more inline comments below before I sign-off for the week-end.</div><div class="gmail_extra"><br></div><div class="gmail_extra">Most of my comments on this patch have focussed towards two goals:</div><div class="gmail_extra"><br></div><div class="gmail_extra"> 1) As close to perfect paridy between read_program_data and write_program_data as we can manage. They should be almost identical except for the direction the data flows.</div><div class="gmail_extra"><br></div><div class="gmail_extra"> 2) Reduced redundancy. There are several places where we pass values or read/write values that are already found in brw_stage_prog_data. Let's just use the ones in brw_stage_prog_data. If we can't trust that, then we're toast anyway.</div><div class="gmail_extra"><br></div><div class="gmail_extra">Hopefully that will make the rest of my comments a bit more understandable.</div><div class="gmail_extra"><br></div><div class="gmail_extra"><div class="gmail_quote">On Fri, Oct 20, 2017 at 4:30 PM, Jason Ekstrand <span dir="ltr"><<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5">On Fri, Oct 20, 2017 at 4:05 PM, Jason Ekstrand <span dir="ltr"><<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="m_1746411855336096395h5">On Wed, Oct 18, 2017 at 10:32 PM, Jordan Justen <span dir="ltr"><<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Timothy Arceri <<a href="mailto:timothy.arceri@collabora.com" target="_blank">timothy.arceri@collabora.com</a>><br>
<br>
This uses the recently-added disk_cache.c to write out the final<br>
linked binary for vertex and fragment shader programs.<br>
<br>
This is based off the initial implementation done by Carl Worth.<br>
<br>
v2:<br>
* Squash 'i965: add image param shader cache support'<br>
* Squash 'i965: add shader cache support for pull param pointers'<br>
* Sustantially simplified by a rework on top of Jason's 2975e4c56a7a.<br>
* Rename load_program_data to read_program_data. (Jason)<br>
<br>
[<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>: *_cached_program => brw_disk_cache_*_program]<br>
[<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>: brw_shader_cache.c => brw_disk_cache.c]<br>
[<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>: don't map to write program when LLC is present]<br>
[<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>: set program_written_to_cache on read from cache]<br>
[<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>: only try cache when status is linking_skipped]<br>
[<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>: rework based on uniforms rework 2975e4c56a7a]<br>
Signed-off-by: Jordan Justen <<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>><br>
---<br>
src/mesa/drivers/dri/i965/Mak<wbr>efile.sources | 1 +<br>
src/mesa/drivers/dri/i965/brw<wbr>_disk_cache.c | 357 +++++++++++++++++++++++++++++<br>
src/mesa/drivers/dri/i965/brw<wbr>_state.h | 5 +<br>
src/mesa/drivers/dri/i965/mes<wbr>on.build | 1 +<br>
4 files changed, 364 insertions(+)<br>
create mode 100644 src/mesa/drivers/dri/i965/brw_<wbr>disk_cache.c<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/Ma<wbr>kefile.sources b/src/mesa/drivers/dri/i965/Ma<wbr>kefile.sources<br>
index 053d89b81e..2980cdb3c5 100644<br>
--- a/src/mesa/drivers/dri/i965/Ma<wbr>kefile.sources<br>
+++ b/src/mesa/drivers/dri/i965/Ma<wbr>kefile.sources<br>
@@ -14,6 +14,7 @@ i965_FILES = \<br>
brw_cs.h \<br>
brw_curbe.c \<br>
brw_defines.h \<br>
+ brw_disk_cache.c \<br>
brw_draw.c \<br>
brw_draw.h \<br>
brw_draw_upload.c \<br>
diff --git a/src/mesa/drivers/dri/i965/br<wbr>w_disk_cache.c b/src/mesa/drivers/dri/i965/br<wbr>w_disk_cache.c<br>
new file mode 100644<br>
index 0000000000..6fe39a7997<br>
--- /dev/null<br>
+++ b/src/mesa/drivers/dri/i965/br<wbr>w_disk_cache.c<br>
@@ -0,0 +1,357 @@<br>
+/*<br>
+ * Copyright © 2014 Intel Corporation<br>
+ *<br>
+ * Permission is hereby granted, free of charge, to any person obtaining a<br>
+ * copy of this software and associated documentation files (the "Software"),<br>
+ * to deal in the Software without restriction, including without limitation<br>
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,<br>
+ * and/or sell copies of the Software, and to permit persons to whom the<br>
+ * Software is furnished to do so, subject to the following conditions:<br>
+ *<br>
+ * The above copyright notice and this permission notice (including the next<br>
+ * paragraph) shall be included in all copies or substantial portions of the<br>
+ * Software.<br>
+ *<br>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br>
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br>
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL<br>
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br>
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING<br>
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS<br>
+ * IN THE SOFTWARE.<br>
+ */<br>
+<br>
+#include "compiler/blob.h"<br>
+#include "compiler/glsl/ir_uniform.h"<br>
+#include "compiler/glsl/shader_cache.h"<br>
+#include "main/mtypes.h"<br>
+#include "util/disk_cache.h"<br>
+#include "util/macros.h"<br>
+#include "util/mesa-sha1.h"<br>
+<br>
+#include "brw_context.h"<br>
+#include "brw_state.h"<br>
+#include "brw_vs.h"<br>
+#include "brw_wm.h"<br>
+<br>
+static size_t<br>
+key_size(gl_shader_stage stage)<br>
+{<br>
+ switch (stage) {<br>
+ case MESA_SHADER_VERTEX:<br>
+ return sizeof(struct brw_vs_prog_key);<br>
+ case MESA_SHADER_TESS_CTRL:<br>
+ return sizeof(struct brw_tcs_prog_key);<br>
+ case MESA_SHADER_TESS_EVAL:<br>
+ return sizeof(struct brw_tes_prog_key);<br>
+ case MESA_SHADER_GEOMETRY:<br>
+ return sizeof(struct brw_gs_prog_key);<br>
+ case MESA_SHADER_FRAGMENT:<br>
+ return sizeof(struct brw_wm_prog_key);<br>
+ case MESA_SHADER_COMPUTE:<br>
+ return sizeof(struct brw_cs_prog_key);<br>
+ default:<br>
+ unreachable("Unsupported stage!");<br>
+ }<br>
+}<br></blockquote><div><br></div></div></div><div>It might be worth putting this in brw_program.h and maybe adding one for prog_data as well.<br></div><div><div class="m_1746411855336096395h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+static void<br>
+gen_shader_sha1(struct brw_context *brw, struct gl_program *prog,<br>
+ gl_shader_stage stage, void *key, unsigned char *out_sha1)<br>
+{<br>
+ char sha1_buf[41];<br>
+ unsigned char sha1[20];<br>
+ char manifest[256];<br>
+ int offset = 0;<br>
+<br>
+ _mesa_sha1_format(sha1_buf, prog->sh.data->sha1);<br>
+ offset += snprintf(manifest, sizeof(manifest), "program: %s\n", sha1_buf);<br>
+<br>
+ _mesa_sha1_compute(key, key_size(stage), sha1);<br>
+ _mesa_sha1_format(sha1_buf, sha1);<br>
+ offset += snprintf(manifest + offset, sizeof(manifest) - offset,<br>
+ "%s_key: %s\n", _mesa_shader_stage_to_abbrev(s<wbr>tage),<br>
+ sha1_buf);<br>
+<br>
+ _mesa_sha1_compute(manifest, strlen(manifest), out_sha1);<br>
+}<br>
+<br>
+static void<br>
+read_program_data(struct gl_program *glprog, struct blob_reader *binary,<br>
+ struct brw_stage_prog_data *prog_data,<br>
+ struct brw_stage_state *stage_state, struct gl_context *ctx)<br></blockquote></div></div></div></div></div></blockquote></div></div></div></div></div></blockquote><div><br></div><div>stage_state is never used in this function, we can get rid of the parameter<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="m_1746411855336096395h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"></blockquote><div><br></div></div></div><div>With the simplifications below, this becomes a very short function. Can we either roll it into read_and_upload or pull the rest of the prog_data read code into this function? I'd really like it if read_program_data and write_program_data were almost identical.<br></div><span><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+{<br>
+ uint32_t nr_params = blob_read_uint32(binary);<br>
+ assert(nr_params == prog_data->nr_params);<br></blockquote><div><br></div></span><div>If we trust prog_data (which we had better be able to do!) this is unnecessary. Same with nr_pull_params.<br></div><span><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ assert(!binary->overrun);<br>
+<br>
+ prog_data->param = rzalloc_array(NULL, uint32_t, nr_params);<br>
+<br>
+ uint32_t nr_image_params = blob_read_uint32(binary);<br>
+ assert(nr_image_params == glprog->info.num_images);<br></blockquote><div><br></div></span><div>I don't think we need this anymore. Let's just drop nr_image_params from read/write_program_data<br></div><div><div class="m_1746411855336096395h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ assert(!binary->overrun);<br>
+<br>
+ for (unsigned i = 0; i < nr_params; i++)<br>
+ prog_data->param[i] = blob_read_uint32(binary);<br>
+<br>
+ uint32_t nr_pull_params = blob_read_uint32(binary);<br>
+ assert(nr_pull_params == prog_data->nr_pull_params);<br>
+<br>
+ prog_data->pull_param = rzalloc_array(NULL, uint32_t, nr_pull_params);<br>
+<br>
+ for (unsigned i = 0; i < nr_pull_params; i++)<br>
+ prog_data->pull_param[i] = blob_read_uint32(binary);<br>
+<br>
+ assert(!binary->overrun);<br>
+}<br>
+<br>
+#define SET_UPLOAD_PRAMS(sh, sh_caps, prog) \<br>
+ assert(prog_data_size == sizeof(struct brw_##sh##_prog_data)); \<br>
+ sh##_key.program_string_id = prog->id; \<br>
+ cache_id = BRW_CACHE_##sh_caps##_PROG; \<br>
+ key = &sh##_key; \<br>
+ max_threads = devinfo->max_##sh##_threads; \<br>
+ stage_state = &brw->sh.base; \<br>
+<br>
+static bool<br>
+read_and_upload(struct brw_context *brw, struct disk_cache *cache,<br>
+ struct blob_reader *binary, struct gl_program *prog,<br>
+ gl_shader_stage stage)<br>
+{<br>
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;<br>
+<br>
+ unsigned char binary_sha1[20];<br>
+<br>
+ struct brw_wm_prog_key wm_key;<br>
+ struct brw_vs_prog_key vs_key;<br>
+<br>
+ switch (stage) {<br>
+ case MESA_SHADER_VERTEX:<br>
+ brw_vs_populate_key(brw, &vs_key);<br>
+ /* We don't care what instance of the program it is we only care if<br>
+ * its the correct binary to load so ignore program id for on disk cache.<br>
+ */<br>
+ vs_key.program_string_id = 0;<br>
+ gen_shader_sha1(brw, prog, stage, &vs_key, binary_sha1);<br>
+ break;<br>
+ case MESA_SHADER_FRAGMENT:<br>
+ brw_wm_populate_key(brw, &wm_key);<br>
+ wm_key.program_string_id = 0;<br>
+ gen_shader_sha1(brw, prog, stage, &wm_key, binary_sha1);<br>
+ break;<br>
+ default:<br>
+ unreachable("Unsupported stage!");<br>
+ }<br>
+<br>
+ size_t size;<br>
+ uint8_t *buffer = disk_cache_get(cache, binary_sha1, &size);<br>
+ if (buffer == NULL) {<br>
+ if (brw->ctx._Shader->Flags & GLSL_CACHE_INFO) {<br>
+ char sha1_buf[41];<br>
+ _mesa_sha1_format(sha1_buf, binary_sha1);<br>
+ fprintf(stderr, "No cached %s binary found for: %s\n",<br>
+ _mesa_shader_stage_to_abbrev(<wbr>stage), sha1_buf);<br>
+ }<br>
+ return false;<br>
+ }<br>
+<br>
+ if (brw->ctx._Shader->Flags & GLSL_CACHE_INFO) {<br>
+ char sha1_buf[41];<br>
+ _mesa_sha1_format(sha1_buf, binary_sha1);<br>
+ fprintf(stderr, "attempting to populate bo cache with binary: %s\n",<br>
+ sha1_buf);<br>
+ }<br>
+<br>
+ blob_reader_init(binary, buffer, size);<br>
+<br>
+ /* Read shader program from blob. */<br>
+ size_t program_size = blob_read_uint32(binary);<br>
+ const uint8_t *program = blob_read_bytes(binary, program_size);<br>
+<br>
+ /* Read shader program_data from blob. */<br>
+ size_t prog_data_size = blob_read_uint32(binary);<br></blockquote><div><br></div></div></div><div>assert(prog_data_size == brw_prog_data_size(stage));<br></div><span><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ assert(!binary->overrun);<br>
+ const void *blob_prog_data = blob_read_bytes(binary, prog_data_size);<br>
+ // TODO: fix mem_ctx<br>
+ struct brw_stage_prog_data *prog_data =<br>
+ ralloc_size(NULL, prog_data_size);<br>
+ memcpy(prog_data, blob_prog_data, prog_data_size);<br></blockquote><div><br></div></span><div>You can just use blob_copy_bytes instead of this.<br></div><div><div class="m_1746411855336096395h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+ /* Upload params set by SET_UPLOAD_PRAMS() */<br>
+ struct brw_stage_state *stage_state;<br>
+ enum brw_cache_id cache_id;<br>
+ unsigned max_threads;<br>
+ void *key;<br>
+<br>
+ switch (stage) {<br>
+ case MESA_SHADER_VERTEX: {<br>
+ struct brw_program *vp = (struct brw_program *) prog;<br>
+ SET_UPLOAD_PRAMS(vs, VS, vp)<br>
+ break;<br>
+ }<br>
+ case MESA_SHADER_FRAGMENT: {<br>
+ struct brw_program *wp = (struct brw_program *) prog;<br>
+ SET_UPLOAD_PRAMS(wm, FS, wp)<br>
+ break;<br>
+ }<br>
+ default:<br>
+ unreachable("Unsupported stage!");<br>
+ }<br>
+<br>
+ read_program_data(prog, binary, prog_data, stage_state, &brw->ctx);<br></blockquote></div></div></div></div></div></blockquote></div></div></div></div></div></blockquote><div><br></div><div>Which means there's no reason we need to call read_program_data *after* the above switch and we can move it up and just roll the other prog_data reading stuff into it.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="m_1746411855336096395h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+ if (binary->current != binary->end || binary->overrun) {<br>
+ /* Something very bad has gone wrong discard the item from the cache and<br>
+ * rebuild from source.<br>
+ */<br>
+ assert(!"Invalid i965 shader disk cache item!");<br>
+<br>
+ if (brw->ctx._Shader->Flags & GLSL_CACHE_INFO) {<br>
+ fprintf(stderr, "Error reading program from cache (invalid i965 "<br>
+ "cache item)\n");<br>
+ }<br>
+<br>
+ disk_cache_remove(cache, binary_sha1);<br>
+ free(buffer);<br>
+ return false;<br>
+ }<br>
+<br>
+ brw_alloc_stage_scratch(brw, stage_state, prog_data->total_scratch,<br>
+ max_threads);<br>
+<br>
+ brw_upload_cache(&brw->cache, cache_id, key, key_size(stage), program,<br>
+ program_size, prog_data, prog_data_size,<br>
+ &stage_state->prog_offset, &stage_state->prog_data);<br>
+<br>
+ prog->program_written_to_cach<wbr>e = true;<br>
+<br>
+ free(buffer);<br>
+<br>
+ return true;<br>
+}<br>
+<br>
+bool<br>
+brw_disk_cache_upload_program<wbr>(struct brw_context *brw, gl_shader_stage stage)<br>
+{<br>
+ struct blob_reader binary;<br>
+<br>
+ struct disk_cache *cache = brw->ctx.Cache;<br>
+ if (cache == NULL)<br>
+ return false;<br>
+<br>
+ struct gl_program *prog = brw->ctx._Shader->CurrentProgr<wbr>am[stage];<br>
+ if (prog == NULL)<br>
+ return false;<br>
+<br>
+ if (prog->sh.data->LinkStatus != linking_skipped)<br>
+ goto FAIL;<br>
+<br>
+ if (!read_and_upload(brw, cache, &binary, prog, stage))<br>
+ goto FAIL;<br>
+<br>
+ if (brw->ctx._Shader->Flags & GLSL_CACHE_INFO) {<br>
+ fprintf(stderr, "read gen program from cache\n");<br>
+ }<br>
+<br>
+ return true;<br>
+<br>
+FAIL:<br>
+ /*FIXME: Fall back and compile from source here. */<br>
+ return false;<br>
+}<br>
+<br>
+static void<br>
+write_program_data(struct brw_context *brw, struct gl_program *prog,<br>
+ void *key, struct brw_stage_prog_data *prog_data,<br>
+ size_t program_size, size_t prog_data_size,<br>
+ uint32_t prog_offset, struct disk_cache *cache,<br>
+ gl_shader_stage stage)<br>
+{<br>
+ unsigned char sha1[20];<br>
+ char buf[41];<br>
+<br>
+ struct blob binary;<br>
+ blob_init(&binary);<br>
+<br>
+ gen_shader_sha1(brw, prog, stage, key, sha1);<br>
+<br>
+ /* Write program to blob. */<br>
+ blob_write_uint32(&binary, program_size);<br>
+<br>
+ size_t blob_offset = blob_reserve_bytes(&binary, program_size);<br>
+ uint8_t *blob_cursor = binary.data + blob_offset;<br>
+<br>
+ /* Copy program binary */<br>
+ if (brw->screen->devinfo.has_llc) {<br>
+ memcpy(blob_cursor, brw->cache.map + prog_offset, program_size);<br></blockquote><div><br></div></div></div><div>blob_overwrite_bytes<br></div><span><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ } else {<br>
+ void *map = brw_bo_map(brw, brw-><a href="http://cache.bo" rel="noreferrer" target="_blank">cache.bo</a>, MAP_READ);<br>
+ if (unlikely(!map)) {<br>
+ _mesa_error_no_memory(__func_<wbr>_);<br>
+ return;<br>
+ }<br>
+ memcpy(blob_cursor, map + prog_offset, program_size);<br></blockquote><div><br></div></span><div>blob_overwrite_bytes<br></div><span><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ brw_bo_unmap(brw-><a href="http://cache.bo" rel="noreferrer" target="_blank">cache.bo</a>);<br>
+ }<br>
+<br>
+ /* Write program_data to blob. */<br>
+ blob_write_uint32(&binary, prog_data_size);<br>
+ blob_write_bytes(&binary, prog_data, prog_data_size);<br>
+<br>
+ blob_write_uint32(&binary, prog_data->nr_params);<br>
+ blob_write_uint32(&binary, prog->info.num_images);<br>
+<br>
+ for (unsigned i = 0; i < prog_data->nr_params; i++) {<br>
+ blob_write_uint32(&binary, prog_data->param[i]);<br></blockquote><div><br></div></span><div>If we're concerned about the efficiency of this code, blob_read/write_bytes might be better here. I don't know that we care that much though.<br></div><div><div class="m_1746411855336096395h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ }<br>
+<br>
+ blob_write_uint32(&binary, prog_data->nr_pull_params);<br>
+ for (unsigned i = 0; i < prog_data->nr_pull_params; i++) {<br>
+ blob_write_uint32(&binary, prog_data->pull_param[i]);<br>
+ }<br>
+<br>
+ _mesa_sha1_format(buf, sha1);<br>
+ if (brw->ctx._Shader->Flags & GLSL_CACHE_INFO) {<br>
+ fprintf(stderr, "putting binary in cache: %s\n", buf);<br>
+ }<br>
+<br>
+ disk_cache_put(cache, sha1, binary.data, binary.size, NULL);<br>
+<br>
+ prog->program_written_to_cach<wbr>e = true;<br>
+ blob_finish(&binary);<br>
+}<br>
+<br>
+void<br>
+brw_disk_cache_write_program(<wbr>struct brw_context *brw)<br>
+{<br>
+ struct disk_cache *cache = brw->ctx.Cache;<br>
+ if (cache == NULL)<br>
+ return;<br>
+<br>
+ struct gl_program *prog =<br>
+ brw->ctx._Shader->CurrentProgr<wbr>am[MESA_SHADER_VERTEX];<br>
+ if (prog && !prog->program_written_to_cach<wbr>e) {<br>
+ struct brw_vs_prog_key vs_key;<br>
+ brw_vs_populate_key(brw, &vs_key);<br>
+ vs_key.program_string_id = 0;<br>
+<br>
+ write_program_data(brw, prog, &vs_key, brw->vs.base.prog_data,<br>
+ brw->vs.base.prog_data->progr<wbr>am_size,<br></blockquote></div></div></div></div></div></blockquote><div><br></div></div></div><div>We don't need to pass this in explicitly<br></div><span class=""><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="m_1746411855336096395h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ sizeof(struct brw_vs_prog_data),<br>
+ brw->vs.base.prog_offset, cache,<br>
+ MESA_SHADER_VERTEX);<br>
+ }<br>
+<br>
+ prog = brw->ctx._Shader->CurrentProgr<wbr>am[MESA_SHADER_FRAGMENT];<br>
+ if (prog && !prog->program_written_to_cach<wbr>e) {<br>
+ struct brw_wm_prog_key wm_key;<br>
+ brw_wm_populate_key(brw, &wm_key);<br>
+ wm_key.program_string_id = 0;<br>
+<br>
+ write_program_data(brw, prog, &wm_key, brw->wm.base.prog_data,<br>
+ brw->wm.base.prog_data->progr<wbr>am_size,<br></blockquote></div></div></div></div></div></blockquote><div><br></div></span><div>Or here<br></div><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="m_1746411855336096395h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ sizeof(struct brw_wm_prog_data),<br>
+ brw->wm.base.prog_offset, cache,<br>
+ MESA_SHADER_FRAGMENT);<br>
+ }<br>
+}<br>
diff --git a/src/mesa/drivers/dri/i965/br<wbr>w_state.h b/src/mesa/drivers/dri/i965/br<wbr>w_state.h<br>
index 8db354cf23..6f2e0501b4 100644<br>
--- a/src/mesa/drivers/dri/i965/br<wbr>w_state.h<br>
+++ b/src/mesa/drivers/dri/i965/br<wbr>w_state.h<br>
@@ -131,6 +131,11 @@ void brw_upload_state_base_address(<wbr>struct brw_context *brw);<br>
void gen8_write_pma_stall_bits(stru<wbr>ct brw_context *brw,<br>
uint32_t pma_stall_bits);<br>
<br>
+/* brw_disk_cache.c */<br>
+bool brw_disk_cache_upload_program(<wbr>struct brw_context *brw,<br>
+ gl_shader_stage stage);<br>
+void brw_disk_cache_write_program(s<wbr>truct brw_context *brw);<br>
+<br>
/****************************<wbr>******************************<wbr>*************<br>
* brw_state.c<br>
*/<br>
diff --git a/src/mesa/drivers/dri/i965/me<wbr>son.build b/src/mesa/drivers/dri/i965/me<wbr>son.build<br>
index 144a254bd6..09e1179adc 100644<br>
--- a/src/mesa/drivers/dri/i965/me<wbr>son.build<br>
+++ b/src/mesa/drivers/dri/i965/me<wbr>son.build<br>
@@ -34,6 +34,7 @@ files_i965 = files(<br>
'brw_cs.h',<br>
'brw_curbe.c',<br>
'brw_defines.h',<br>
+ 'brw_disk_cache.c',<br>
'brw_draw.c',<br>
'brw_draw.h',<br>
'brw_draw_upload.c',<br>
<span class="m_1746411855336096395m_-4802149799835681699HOEnZb"><font color="#888888">--<br>
2.15.0.rc0<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div></div></div><br></div></div>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div></div>