Mesa (master): nir: const `nir_call_instr::callee`

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Mar 19 12:58:45 UTC 2019


Module: Mesa
Branch: master
Commit: db57db5317e81fb4ce31bc294fdcc199db651542
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db57db5317e81fb4ce31bc294fdcc199db651542

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Tue Mar 19 09:04:26 2019 +0000

nir: const `nir_call_instr::callee`

Fixes: c95afe56a8033a87dca7 "nir/spirv: handle kernel function parameters"
Cc: Jason Ekstrand <jason at jlekstrand.net>
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Acked-by: Tapani Pälli <tapani.palli at intel.com>
Acked-by: Karol Herbst <kherbst at redhat.com>

---

 src/compiler/nir/nir.c | 2 +-
 src/compiler/nir/nir.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index 4a7c757db3a..62a80aa87ac 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -515,7 +515,7 @@ nir_intrinsic_instr_create(nir_shader *shader, nir_intrinsic_op op)
 }
 
 nir_call_instr *
-nir_call_instr_create(nir_shader *shader, nir_function *callee)
+nir_call_instr_create(nir_shader *shader, const nir_function *callee)
 {
    const unsigned num_params = callee->num_params;
    nir_call_instr *instr =
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 067287fab1c..f85b4be5a53 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -1084,7 +1084,7 @@ unsigned nir_deref_instr_ptr_as_array_stride(nir_deref_instr *instr);
 typedef struct {
    nir_instr instr;
 
-   struct nir_function *callee;
+   const struct nir_function *callee;
 
    unsigned num_params;
    nir_src params[];
@@ -2435,7 +2435,7 @@ nir_intrinsic_instr *nir_intrinsic_instr_create(nir_shader *shader,
                                                 nir_intrinsic_op op);
 
 nir_call_instr *nir_call_instr_create(nir_shader *shader,
-                                      nir_function *callee);
+                                      const nir_function *callee);
 
 nir_tex_instr *nir_tex_instr_create(nir_shader *shader, unsigned num_srcs);
 




More information about the mesa-commit mailing list