commit a097bf160a9c05e173f7255891a38304a326ca52
author Jason Ekstrand <jason@jlekstrand.net> Fri Aug 14 21:19:07 2020 -0500
committer Marge Bot <eric+marge@anholt.net> Mon Aug 17 14:36:18 2020 +0000
tree b564e6864db59f88407096efc6267e3a74b453db
parent 627c8e1640b3a2e4b2f86c52d88aa0848c583633

nir/builder: Make nir_get_ptr_bitsize take a nir_shader

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6330>

src/compiler/nir/nir_builder.h

diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h
index 10268dd..1c1ed9d 100644
--- a/src/compiler/nir/nir_builder.h
+++ b/src/compiler/nir/nir_builder.h
@@ -963,10 +963,10 @@
 }
 
 static inline unsigned
-nir_get_ptr_bitsize(nir_builder *build)
+nir_get_ptr_bitsize(nir_shader *shader)
 {
-   if (build->shader->info.stage == MESA_SHADER_KERNEL)
-      return build->shader->info.cs.ptr_size;
+   if (shader->info.stage == MESA_SHADER_KERNEL)
+      return shader->info.cs.ptr_size;
    return 32;
 }
 
@@ -981,7 +981,7 @@
    deref->var = var;
 
    nir_ssa_dest_init(&deref->instr, &deref->dest, 1,
-                     nir_get_ptr_bitsize(build), NULL);
+                     nir_get_ptr_bitsize(build->shader), NULL);
 
    nir_builder_instr_insert(build, &deref->instr);