summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2018-10-28 17:52:14 +0000
committerEric Engestrom <[email protected]>2018-10-30 18:10:59 +0000
commit2894e278cf366eb74bf9fc11cc5fc45c5cc0c360 (patch)
tree84ab3959f524807b1f564389bf27d890e5a3948f /src
parent6000895e2dd20f8f737a7429db09ab6576301c86 (diff)
mesa: fix struct/class mismatch
Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi.cpp2
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.cpp2
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi_array_merge.h2
-rw-r--r--src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp4
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 a61d4ddaf14..ef3c370d4bc 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 1431824369e..e54bb7b9f4d 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 7d52d095cfb..15738a817d3 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 e1519ef3ca3..210c25e8ba8 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;