<div dir="ltr"><div><div></div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>><br><br></div>Marek<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Mar 14, 2018 at 2:01 AM, Timothy Arceri <span dir="ltr"><<a href="mailto:tarceri@itsqueeze.com" target="_blank">tarceri@itsqueeze.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
src/mesa/program/ir_to_mesa.<wbr>cpp | 20 ++++++++++++++++++--<br>
1 file changed, 18 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/mesa/program/ir_to_mesa.<wbr>cpp b/src/mesa/program/ir_to_mesa.<wbr>cpp<br>
index 149d914bc4..19a9fd3fc2 100644<br>
--- a/src/mesa/program/ir_to_mesa.<wbr>cpp<br>
+++ b/src/mesa/program/ir_to_mesa.<wbr>cpp<br>
@@ -2635,8 +2635,24 @@ _mesa_associate_uniform_<wbr>storage(struct gl_context *ctx,<br>
*/<br>
if (propagate_to_storage) {<br>
unsigned array_elements = MAX2(1, storage->array_elements);<br>
- _mesa_propagate_uniforms_to_<wbr>driver_storage(storage, 0,<br>
- array_elements);<br>
+ if (ctx->Const.<wbr>PackedDriverUniformStorage && !prog->is_arb_asm &&<br>
+ (storage->is_bindless || !storage->type->contains_<wbr>opaque())) {<br>
+ const int dmul = storage->type->is_64bit() ? 2 : 1;<br>
+ const unsigned components =<br>
+ storage->type->vector_elements *<br>
+ storage->type->matrix_columns;<br>
+<br>
+ for (unsigned s = 0; s < storage->num_driver_storage; s++) {<br>
+ gl_constant_value *uni_storage = (gl_constant_value *)<br>
+ storage->driver_storage[s].<wbr>data;<br>
+ memcpy(uni_storage, storage->storage,<br>
+ sizeof(storage->storage[0]) * components *<br>
+ array_elements * dmul);<br>
+ }<br>
+ } else {<br>
+ _mesa_propagate_uniforms_to_<wbr>driver_storage(storage, 0,<br>
+ array_elements);<br>
+ }<br>
}<br>
<br>
last_location = location;<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.14.3<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>