diff options
author | Eric Engestrom <[email protected]> | 2019-03-09 22:27:51 +0000 |
---|---|---|
committer | Eric Engestrom <[email protected]> | 2019-03-09 22:37:40 +0000 |
commit | e6ba67dd65c890237dd11ef43505d982431e5cc0 (patch) | |
tree | 0e36802b25e39e98a2fa06293dca159b68ff5a31 /src/gallium/drivers | |
parent | d4d29c0455bf8540de3c006dd213ae1ccf2bc361 (diff) |
panfrost: move #include to fix compilation
In standalone.h, the struct gl_context type is not declared by #includ'ing
mtypes.h:
In file included from src/gallium/drivers/panfrost/midgard/cmdline.c:24:
src/compiler/glsl/standalone.h:46:14: warning: ‘struct gl_context’ declared inside parameter list will not be visible outside of this definition or declaration
struct gl_context *ctx);
^~~~~~~~~~
This causes the following compilation failure:
src/gallium/drivers/panfrost/midgard/cmdline.c: In function ‘compile_shader’:
src/gallium/drivers/panfrost/midgard/cmdline.c:58:61: error: passing argument 4 of ‘standalone_compile_shader’ from incompatible pointer type [-Werror=incompatible-pointer-types]
prog = standalone_compile_shader(&options, 2, argv, &local_ctx);
^~~~~~~~~~
In file included from src/gallium/drivers/panfrost/midgard/cmdline.c:24:
src/compiler/glsl/standalone.h:43:28: note: expected ‘struct gl_context *’ but argument is of type ‘struct gl_context *’
struct gl_shader_program * standalone_compile_shader(
^~~~~~~~~~~~~~~~~~~~~~~~~
Fixes: e67e0726372ab65f4104 "panfrost: Implement Midgard shader toolchain"
Cc: Alyssa Rosenzweig <[email protected]>
Signed-off-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/panfrost/midgard/cmdline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/panfrost/midgard/cmdline.c b/src/gallium/drivers/panfrost/midgard/cmdline.c index acd810b2f34..8d7463d783f 100644 --- a/src/gallium/drivers/panfrost/midgard/cmdline.c +++ b/src/gallium/drivers/panfrost/midgard/cmdline.c @@ -21,13 +21,13 @@ * SOFTWARE. */ +#include "main/mtypes.h" #include "compiler/glsl/standalone.h" #include "compiler/glsl/glsl_to_nir.h" #include "compiler/nir_types.h" #include "midgard_compile.h" #include "disassemble.h" #include "util/u_dynarray.h" -#include "main/mtypes.h" bool c_do_mat_op_to_vec(struct exec_list *instructions); |