From e89683d5a2b11ca416cfb346c2b517405d37da62 Mon Sep 17 00:00:00 2001
From: "Kristian H. Kristensen" <hoegsberg@chromium.org>
Date: Wed, 15 Aug 2018 09:18:39 -0700
Subject: freedreno: Fix warnings

Signed-off-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
---
 src/gallium/drivers/freedreno/ir3/ir3.h         | 8 ++------
 src/gallium/drivers/freedreno/ir3/ir3_cmdline.c | 2 +-
 src/gallium/drivers/freedreno/ir3/ir3_shader.h  | 4 +---
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/gallium/drivers/freedreno/ir3')

diff --git a/src/gallium/drivers/freedreno/ir3/ir3.h b/src/gallium/drivers/freedreno/ir3/ir3.h
index 8bac91660bc..63215cefc96 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3.h
+++ b/src/gallium/drivers/freedreno/ir3/ir3.h
@@ -445,14 +445,12 @@ struct ir3 {
 #endif
 };
 
-typedef struct nir_register nir_register;
-
 struct ir3_array {
 	struct list_head node;
 	unsigned length;
 	unsigned id;
 
-	nir_register *r;
+	struct nir_register *r;
 
 	/* To avoid array write's from getting DCE'd, keep track of the
 	 * most recent write.  Any array access depends on the most
@@ -470,13 +468,11 @@ struct ir3_array {
 
 struct ir3_array * ir3_lookup_array(struct ir3 *ir, unsigned id);
 
-typedef struct nir_block nir_block;
-
 struct ir3_block {
 	struct list_head node;
 	struct ir3 *shader;
 
-	const nir_block *nblock;
+	const struct nir_block *nblock;
 
 	struct list_head instr_list;  /* list of ir3_instruction */
 
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
index 23d50063520..b41c32d3756 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
@@ -379,7 +379,7 @@ int main(int argc, char **argv)
 
 	while (n < argc) {
 		char *filename = argv[n];
-		char *ext = rindex(filename, '.');
+		char *ext = strrchr(filename, '.');
 
 		if (strcmp(ext, ".tgsi") == 0) {
 			if (num_files != 0)
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_shader.h b/src/gallium/drivers/freedreno/ir3/ir3_shader.h
index 507e89c4735..288e9fa4e70 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_shader.h
+++ b/src/gallium/drivers/freedreno/ir3/ir3_shader.h
@@ -345,8 +345,6 @@ struct ir3_shader_variant {
 	struct ir3_shader *shader;
 };
 
-typedef struct nir_shader nir_shader;
-
 struct ir3_shader {
 	enum shader_t type;
 
@@ -359,7 +357,7 @@ struct ir3_shader {
 
 	struct ir3_compiler *compiler;
 
-	nir_shader *nir;
+	struct nir_shader *nir;
 	struct pipe_stream_output_info stream_output;
 
 	struct ir3_shader_variant *variants;
-- 
cgit v1.2.3