mesa: fix struct/class mismatch

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index a61d4ddaf14f2fdaecdff082e45c8b622fb77a95..ef3c370d4bcbfda9cf2eb0841fad7e3ea5b96cd0 100644 (file)
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -5594,7 +5594,7 @@ glsl_to_tgsi_visitor::split_arrays(void)
 void
 glsl_to_tgsi_visitor::merge_registers(void)
 {
-   struct array_live_range *arr_live_ranges = NULL;
+   class array_live_range *arr_live_ranges = NULL;
 
    struct register_live_range *reg_live_ranges =
         rzalloc_array(mem_ctx, struct register_live_range, this->next_temp);

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.cpp
index 1431824369e4b1f029cacf0e33d01f48387116c4..e54bb7b9f4d8b412d63f6faa35a7178a5b0275ef 100644 (file)
--- a/src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.cpp
@@ -686,7 +686,7 @@ using namespace tgsi_array_merge;
 int  merge_arrays(int narrays,
                  unsigned *array_sizes,
                  exec_list *instructions,
-                 struct array_live_range *arr_live_ranges)
+                 class array_live_range *arr_live_ranges)
 {
    array_remapping *map= new array_remapping[narrays + 1];
 

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.h b/src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.h
index 7d52d095cfb84b080d14135f14ab7d2da4f10000..15738a817d342e562a0c60719f0e9a00572c9859 100644 (file)
--- a/src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.h
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.h
@@ -184,5 +184,5 @@ int remap_arrays(int narrays, unsigned *array_sizes,
 int merge_arrays(int narrays,
                 unsigned *array_sizes,
                 exec_list *instructions,
-                struct array_live_range *arr_live_ranges);
+                class array_live_range *arr_live_ranges);
 #endif

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
index e1519ef3ca3027a610daa5a559cc340a6b8037fc..210c25e8ba8435966b515e229b868262a0794c3c 100644 (file)
--- a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
@@ -1087,7 +1087,7 @@ void access_recorder::record_write(const st_dst_reg& dst, int line,
 }
 
 void access_recorder::get_required_live_ranges(struct register_live_range *register_live_ranges,
-                                              struct array_live_range *array_live_ranges)
+                                              class array_live_range *array_live_ranges)
 {
    RENAME_DEBUG(debug_log << "== register live ranges ==========\n");
    for(int i = 0; i < ntemps; ++i) {
@@ -1122,7 +1122,7 @@ static void dump_instruction(ostream& os, int line, prog_scope *scope,
 bool
 get_temp_registers_required_live_ranges(void *mem_ctx, exec_list *instructions,
                  int ntemps, struct register_live_range *register_live_ranges,
-                 int narrays, struct array_live_range *array_live_ranges)
+                 int narrays, class array_live_range *array_live_ranges)
 {
    int line = 0;
    int loop_id = 1;