<div dir="ltr">Looks good<br></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Nov 23, 2018 at 8:29 AM Juan A. Suarez Romero <<a href="mailto:jasuarez@igalia.com">jasuarez@igalia.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Wed, 2018-11-21 at 17:20 -0600, Jason Ekstrand wrote:<br>
> It affects apply_pipeline_layout. Shaders compiled with the wrong value<br>
> will work but they may not be robust as requested by the app.<br>
> <br>
> Cc: <a href="mailto:mesa-stable@lists.freedesktop.org" target="_blank">mesa-stable@lists.freedesktop.org</a><br>
<br>
<br>
Hi, Jason.<br>
<br>
This patch does not apply cleanly in 18.2 branch. As the fix wasn't as trivial<br>
as usual, it would be great if you can check the resolution at <br>
<br>
<br>
<a href="https://gitlab.freedesktop.org/mesa/mesa/commit/35379ec233353d19d94994dfa43b205a6b5622b2" rel="noreferrer" target="_blank">https://gitlab.freedesktop.org/mesa/mesa/commit/35379ec233353d19d94994dfa43b205a6b5622b2</a><br>
<br>
<br>
Thanks in advance!<br>
<br>
J.A.<br>
<br>
> ---<br>
> src/intel/vulkan/anv_pipeline.c | 6 ++++++<br>
> 1 file changed, 6 insertions(+)<br>
> <br>
> diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c<br>
> index ad0f08253e7..f170366d030 100644<br>
> --- a/src/intel/vulkan/anv_pipeline.c<br>
> +++ b/src/intel/vulkan/anv_pipeline.c<br>
> @@ -446,6 +446,9 @@ anv_pipeline_hash_graphics(struct anv_pipeline *pipeline,<br>
> if (layout)<br>
> _mesa_sha1_update(&ctx, layout->sha1, sizeof(layout->sha1));<br>
> <br>
> + const bool rba = pipeline->device->robust_buffer_access;<br>
> + _mesa_sha1_update(&ctx, &rba, sizeof(rba));<br>
> +<br>
> for (unsigned s = 0; s < MESA_SHADER_STAGES; s++) {<br>
> if (stages[s].entrypoint)<br>
> anv_pipeline_hash_shader(&ctx, &stages[s]);<br>
> @@ -466,6 +469,9 @@ anv_pipeline_hash_compute(struct anv_pipeline *pipeline,<br>
> if (layout)<br>
> _mesa_sha1_update(&ctx, layout->sha1, sizeof(layout->sha1));<br>
> <br>
> + const bool rba = pipeline->device->robust_buffer_access;<br>
> + _mesa_sha1_update(&ctx, &rba, sizeof(rba));<br>
> +<br>
> anv_pipeline_hash_shader(&ctx, stage);<br>
> <br>
> _mesa_sha1_final(&ctx, sha1_out);<br>
<br>
</blockquote></div>