Mesa (master): mesa: fix struct/class mismatch

[GitLab Mirror]

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

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Sun Oct 28 17:52:14 2018 +0000

mesa: fix struct/class mismatch

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

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp             | 2 +-
 src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.cpp | 2 +-
 src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.h   | 2 +-
 src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index a61d4ddaf1..ef3c370d4b 100644
--- 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 1431824369..e54bb7b9f4 100644
--- 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 7d52d095cf..15738a817d 100644
--- 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 e1519ef3ca..210c25e8ba 100644
--- 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;