Mesa (master): aco: Constify radv_nir_compiler_options in isel

[GitLab Mirror]

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

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Wed Oct 30 11:54:43 2019 +0100

aco: Constify radv_nir_compiler_options in isel

It's already const for everything else.

Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>

---

 src/amd/compiler/aco_instruction_selection.cpp       | 2 +-
 src/amd/compiler/aco_instruction_selection_setup.cpp | 4 ++--
 src/amd/compiler/aco_ir.h                            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 3bc866bc056..23629ffe22b 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -7721,7 +7721,7 @@ void select_program(Program *program,
                     struct nir_shader *const *shaders,
                     ac_shader_config* config,
                     struct radv_shader_info *info,
-                    struct radv_nir_compiler_options *options)
+                    const struct radv_nir_compiler_options *options)
 {
    isel_context ctx = setup_isel_context(program, shader_count, shaders, config, info, options);
 
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 807ce746868..1c672e3eb31 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -70,7 +70,7 @@ struct vs_output_state {
 };
 
 struct isel_context {
-   struct radv_nir_compiler_options *options;
+   const struct radv_nir_compiler_options *options;
    Program *program;
    nir_shader *shader;
    uint32_t constant_data_offset;
@@ -1179,7 +1179,7 @@ setup_isel_context(Program* program,
                    struct nir_shader *const *shaders,
                    ac_shader_config* config,
                    radv_shader_info *info,
-                   radv_nir_compiler_options *options)
+                   const radv_nir_compiler_options *options)
 {
    program->stage = 0;
    for (unsigned i = 0; i < shader_count; i++) {
diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h
index 59e77feffe5..370aa5a03c2 100644
--- a/src/amd/compiler/aco_ir.h
+++ b/src/amd/compiler/aco_ir.h
@@ -1209,7 +1209,7 @@ void select_program(Program *program,
                     struct nir_shader *const *shaders,
                     ac_shader_config* config,
                     struct radv_shader_info *info,
-                    struct radv_nir_compiler_options *options);
+                    const struct radv_nir_compiler_options *options);
 
 void lower_wqm(Program* program, live& live_vars,
                const struct radv_nir_compiler_options *options);