diff options
| author | Russell King <rmk@armlinux.org.uk> | 2017-02-11 15:08:34 +0000 |
|---|---|---|
| committer | Russell King <rmk@armlinux.org.uk> | 2017-02-11 17:21:06 +0000 |
| commit | 07a06b26d123ee5b4d50b8ad92a351390643e751 (patch) | |
| tree | d61fad2df1e494719dea6761b6e9b6550fa906b5 | |
| parent | 073e4e5a4e953ee5cb8525640959c946823ca788 (diff) | |
etnaviv: remove <etnaviv/etna_bo.h> include from etnaviv_accel.h
Remove the etna_bo.h include from etnaviv_accel.h, and include it where
necessary.
Signed-off-by: Russell King <rmk@armlinux.org.uk>
| -rw-r--r-- | etnaviv/etnaviv.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_accel.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_accel.h | 4 | ||||
| -rw-r--r-- | etnaviv/etnaviv_dri3.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_emit.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_render.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_utils.c | 1 |
7 files changed, 9 insertions, 1 deletions
diff --git a/etnaviv/etnaviv.c b/etnaviv/etnaviv.c index f71f5ff..99a7944 100644 --- a/etnaviv/etnaviv.c +++ b/etnaviv/etnaviv.c @@ -42,6 +42,7 @@ #include "etnaviv_utils.h" #include "etnaviv_xv.h" +#include <etnaviv/etna_bo.h> #include <etnaviv/state_2d.xml.h> #include "etnaviv_compat.h" diff --git a/etnaviv/etnaviv_accel.c b/etnaviv/etnaviv_accel.c index 74789e4..fd9da7d 100644 --- a/etnaviv/etnaviv_accel.c +++ b/etnaviv/etnaviv_accel.c @@ -35,6 +35,7 @@ #include "etnaviv_utils.h" #include <etnaviv/etna.h> +#include <etnaviv/etna_bo.h> #include <etnaviv/state.xml.h> #include <etnaviv/state_2d.xml.h> #include "etnaviv_compat.h" diff --git a/etnaviv/etnaviv_accel.h b/etnaviv/etnaviv_accel.h index 0355c90..ba66447 100644 --- a/etnaviv/etnaviv_accel.h +++ b/etnaviv/etnaviv_accel.h @@ -13,13 +13,15 @@ #include "etnaviv_compat_xorg.h" #include <etnaviv/viv.h> -#include <etnaviv/etna_bo.h> struct armada_accel_ops; struct drm_armada_bo; struct drm_armada_bufmgr; struct etnaviv_dri2_info; +/* From libetnaviv */ +struct etna_bo; + #undef DEBUG /* Debugging options */ diff --git a/etnaviv/etnaviv_dri3.c b/etnaviv/etnaviv_dri3.c index 95e93a9..4972081 100644 --- a/etnaviv/etnaviv_dri3.c +++ b/etnaviv/etnaviv_dri3.c @@ -29,6 +29,7 @@ #include "etnaviv_accel.h" #include "etnaviv_dri3.h" +#include <etnaviv/etna_bo.h> #include "etnaviv_compat.h" static Bool etnaviv_dri3_authorise(struct etnaviv *etnaviv, int fd) diff --git a/etnaviv/etnaviv_emit.c b/etnaviv/etnaviv_emit.c index c176ef3..e765c2f 100644 --- a/etnaviv/etnaviv_emit.c +++ b/etnaviv/etnaviv_emit.c @@ -9,6 +9,7 @@ #include "etnaviv_op.h" #include <etnaviv/etna.h> +#include <etnaviv/etna_bo.h> void etnaviv_emit(struct etnaviv *etnaviv) { diff --git a/etnaviv/etnaviv_render.c b/etnaviv/etnaviv_render.c index 33d22d8..b0bb3bf 100644 --- a/etnaviv/etnaviv_render.c +++ b/etnaviv/etnaviv_render.c @@ -37,6 +37,7 @@ #include "etnaviv_render.h" #include "etnaviv_utils.h" +#include <etnaviv/etna_bo.h> #include <etnaviv/common.xml.h> #include <etnaviv/state_2d.xml.h> #include "etnaviv_compat.h" diff --git a/etnaviv/etnaviv_utils.c b/etnaviv/etnaviv_utils.c index 11fcde7..4e0fc1d 100644 --- a/etnaviv/etnaviv_utils.c +++ b/etnaviv/etnaviv_utils.c @@ -29,6 +29,7 @@ #include "etnaviv_accel.h" #include "etnaviv_utils.h" +#include <etnaviv/etna_bo.h> #include <etnaviv/common.xml.h> #include <etnaviv/state_2d.xml.h> #include "etnaviv_compat.h" |