<div dir="ltr"><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>></div><div><br></div><div>Marek<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, May 31, 2019 at 8:55 AM Connor Abbott <<a href="mailto:cwabbott0@gmail.com">cwabbott0@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Bindless handles in GL are 64-bit. This fixes an assert failure in LLVM.<br>
---<br>
<br>
With this patch, we now have Piglit parity in debug mode.<br>
<br>
 src/gallium/drivers/radeonsi/si_shader_nir.c | 4 ++--<br>
 1 file changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c<br>
index 19ed71ae05d..72e6ffbac8a 100644<br>
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c<br>
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c<br>
@@ -1020,7 +1020,7 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi,<br>
                         * 16-dword slots for now.<br>
                         */<br>
                        dynamic_index = LLVMBuildMul(ctx->ac.builder, dynamic_index,<br>
-                                            LLVMConstInt(ctx->i32, 2, 0), "");<br>
+                                            LLVMConstInt(ctx->i64, 2, 0), "");<br>
<br>
                        return si_load_image_desc(ctx, list, dynamic_index, desc_type,<br>
                                                  dcc_off, true);<br>
@@ -1032,7 +1032,7 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi,<br>
                 * to prevent incorrect code generation and hangs.<br>
                 */<br>
                dynamic_index = LLVMBuildMul(ctx->ac.builder, dynamic_index,<br>
-                                            LLVMConstInt(ctx->i32, 2, 0), "");<br>
+                                            LLVMConstInt(ctx->i64, 2, 0), "");<br>
                list = ac_build_pointer_add(&ctx->ac, list, dynamic_index);<br>
                return si_load_sampler_desc(ctx, list, ctx->i32_0, desc_type);<br>
        }<br>
-- <br>
2.17.2<br>
<br>
_______________________________________________<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/mailman/listinfo/mesa-dev</a></blockquote></div>