<div dir="ltr"><div><div>1-6 are<br><br></div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br><br></div>I think Nanley had a typo fix on 1 that you should probably take care of.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 21, 2016 at 10:31 PM, Kenneth Graunke <span dir="ltr"><<a href="mailto:kenneth@whitecape.org" target="_blank">kenneth@whitecape.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Cc: <a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.<wbr>org</a><br>
Signed-off-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>><br>
---<br>
src/mesa/drivers/dri/i965/brw_<wbr>wm_surface_state.c | 7 +++++--<br>
1 file changed, 5 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/<wbr>brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/<wbr>brw_wm_surface_state.c<br>
index 7b5e380..834e8f2 100644<br>
--- a/src/mesa/drivers/dri/i965/<wbr>brw_wm_surface_state.c<br>
+++ b/src/mesa/drivers/dri/i965/<wbr>brw_wm_surface_state.c<br>
@@ -1840,10 +1840,12 @@ brw_upload_cs_work_groups_<wbr>surface(struct brw_context *brw)<br>
/* _NEW_PROGRAM */<br>
struct gl_shader_program *prog =<br>
ctx->_Shader->CurrentProgram[<wbr>MESA_SHADER_COMPUTE];<br>
+ /* BRW_NEW_CS_PROG_DATA */<br>
+ const struct brw_cs_prog_data *cs_prog_data = brw->cs.prog_data;<br>
<br>
- if (prog && brw->cs.prog_data->uses_num_<wbr>work_groups) {<br>
+ if (prog && cs_prog_data->uses_num_work_<wbr>groups) {<br>
const unsigned surf_idx =<br>
- brw->cs.prog_data->binding_<wbr>table.work_groups_start;<br>
+ cs_prog_data->binding_table.<wbr>work_groups_start;<br>
uint32_t *surf_offset = &brw->cs.base.surf_offset[<wbr>surf_idx];<br>
drm_intel_bo *bo;<br>
uint32_t bo_offset;<br>
@@ -1872,6 +1874,7 @@ brw_upload_cs_work_groups_<wbr>surface(struct brw_context *brw)<br>
const struct brw_tracked_state brw_cs_work_groups_surface = {<br>
.dirty = {<br>
.brw = BRW_NEW_BLORP |<br>
+ BRW_NEW_CS_PROG_DATA |<br>
BRW_NEW_CS_WORK_GROUPS<br>
},<br>
.emit = brw_upload_cs_work_groups_<wbr>surface,<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.10.0<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">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><br></div>