diff options
| author | Vinson Lee <[email protected]> | 2016-06-29 20:15:03 -0700 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2016-07-01 00:19:24 -0700 |
| commit | 3fea592c4eb26f6652bef1e5dc430e2296e14bac (patch) | |
| tree | 8bc621de5a022d771504909f696bb207984cea0e | |
| parent | a97ee60926f6c08cb4cdd26a2746c483d8782547 (diff) | |
mesa/st: Use 'struct nir_shader' instead of 'nir_shader'.
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
Suggested-by: Rob Clark <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96235
Signed-off-by: Vinson Lee <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Reviewed-by: Rob Clark <[email protected]>
| -rw-r--r-- | src/mesa/state_tracker/st_nir.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_nir.h b/src/mesa/state_tracker/st_nir.h index 19e2d2d97ff..523a274bb13 100644 --- a/src/mesa/state_tracker/st_nir.h +++ b/src/mesa/state_tracker/st_nir.h @@ -31,14 +31,14 @@ extern "C" { #endif -typedef struct nir_shader nir_shader; +struct 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, - gl_shader_stage stage); +void st_nir_lower_builtin(struct nir_shader *shader); +struct nir_shader * st_glsl_to_nir(struct st_context *st, struct gl_program *prog, + struct gl_shader_program *shader_program, + gl_shader_stage stage); -void st_finalize_nir(struct st_context *st, struct gl_program *prog, nir_shader *nir); +void st_finalize_nir(struct st_context *st, struct gl_program *prog, struct nir_shader *nir); struct gl_program * st_nir_get_mesa_program(struct gl_context *ctx, |