diff options
| author | Emil Velikov <[email protected]> | 2015-10-29 10:17:04 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-10-30 17:37:09 +0000 |
| commit | 493e410d552e97572ca9a492d23648f6a236e4a4 (patch) | |
| tree | c9eba7f41222c8b8825e759b84ea47c78269145b /src/gallium/winsys/virgl/vtest | |
| parent | 7154d48c6e02c6cb29d877a3fac9de98f7cb1b4a (diff) | |
virgl: unwrap the includes
Include what you want, rather than relying on a header foo.h N levels
down the include chain, to provide something that you need.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/winsys/virgl/vtest')
4 files changed, 12 insertions, 8 deletions
diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_public.h b/src/gallium/winsys/virgl/vtest/virgl_vtest_public.h index 72336499b44..47379d9c735 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_public.h +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_public.h @@ -24,6 +24,7 @@ #define VIRGL_VTEST_PUBLIC_H struct virgl_winsys; +struct sw_winsys; struct virgl_winsys *virgl_vtest_winsys_wrap(struct sw_winsys *sws); diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c index 8fd6a510f70..e33475334ce 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c @@ -20,8 +20,7 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "virgl_vtest_winsys.h" -#include "virgl_vtest_public.h" + #include <sys/socket.h> #include <errno.h> #include <stdio.h> @@ -34,6 +33,9 @@ /* connect to remote socket */ #define VTEST_SOCKET_NAME "/tmp/.virgl_test" +#include "virgl_vtest_winsys.h" +#include "virgl_vtest_public.h" + /* block read/write routines */ static int virgl_block_write(int fd, void *buf, int size) { diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c index 28c4c62931b..6181d7c1976 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c @@ -21,13 +21,14 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include <stdio.h> -#include "virgl_vtest_winsys.h" -#include "virgl_vtest_public.h" #include "util/u_memory.h" #include "util/u_format.h" #include "util/u_inlines.h" -#include "state_tracker/drm_driver.h" #include "os/os_time.h" +#include "state_tracker/sw_winsys.h" + +#include "virgl_vtest_winsys.h" +#include "virgl_vtest_public.h" static void *virgl_vtest_resource_map(struct virgl_winsys *vws, struct virgl_hw_res *res); static void virgl_vtest_resource_unmap(struct virgl_winsys *vws, struct virgl_hw_res *res); diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h index fd8cb7a6368..72ca2b207b1 100644 --- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h +++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h @@ -27,15 +27,15 @@ #include "pipe/p_compiler.h" #include "pipe/p_defines.h" #include "pipe/p_state.h" -#include "state_tracker/sw_winsys.h" -#include "virgl/virgl_hw.h" -#include "virgl/virgl_winsys.h" #include "util/list.h" #include "os/os_thread.h" +#include "virgl/virgl_winsys.h" #include "vtest_protocol.h" struct pipe_fence_handle; +struct sw_winsys; +struct sw_displaytarget; struct virgl_vtest_winsys { struct virgl_winsys base; |