fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-21 20:40:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

mesa/st: Use 'struct nir_shader' instead of 'nir_shader'.

Browse source 
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 <robdclark@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96235
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Vinson Lee 2016-06-29 20:15:03 -07:00
parent a97ee60926
commit 3fea592c4e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/state_tracker/st_nir.h
View file

@ -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,