[Mesa-dev] [PATCH] mesa/st: Include nir.h for nir_shader symbol.

Vinson Lee vlee at freedesktop.org
Tue Jun 28 01:45:31 UTC 2016


Fix this build error with GCC 4.4.

  CC     state_tracker/st_nir_lower_builtin.lo
In file included from state_tracker/st_nir_lower_builtin.c:61:
state_tracker/st_nir.h:34: error: redefinition of typedef ‘nir_shader’
../../src/compiler/nir/nir.h:1830: note: previous declaration of ‘nir_shader’ was here

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96235
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
---
 src/mesa/state_tracker/st_nir.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_nir.h b/src/mesa/state_tracker/st_nir.h
index 49ba573..d3b4704 100644
--- a/src/mesa/state_tracker/st_nir.h
+++ b/src/mesa/state_tracker/st_nir.h
@@ -26,13 +26,12 @@
 
 #include "st_context.h"
 #include "compiler/shader_enums.h"
+#include "compiler/nir/nir.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct nir_shader nir_shader;
-
 void st_nir_lower_builtin(nir_shader *shader);
 nir_shader * st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
                             struct gl_shader_program *shader_program,
-- 
1.7.1



More information about the mesa-dev mailing list