virgl: move virgl_hw.h into the driver dir

Strictly speaking virgl_hw.h should reside in the driver folder, as it describes the hardware. Moving it allows us to nuke the following strange dependency winsys/vtest > driver > winsys/drm Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
2015-10-28 14:39:45 +00:00
parent 014f8ef2ff
commit 87f7d61e19
9 changed files with 5 additions and 7 deletions
@@ -5,6 +5,7 @@ C_SOURCES := \
 	virgl_encode.c \
 	virgl_encode.h \
 	virgl.h \
+	virgl_hw.h \
 	virgl_protocol.h \
 	virgl_public.h \
 	virgl_query.c \
@@ -25,7 +25,7 @@

 #include "util/u_transfer.h"

-#include "virgl/drm/virgl_hw.h"
+#include "virgl_hw.h"

 #include "virgl_winsys.h"
 #include "pipe/p_screen.h"
@@ -29,7 +29,7 @@
 #include "util/list.h"
 #include "util/u_transfer.h"

-#include "virgl/drm/virgl_hw.h"
+#include "virgl_hw.h"
 #define VR_MAX_TEXTURE_2D_LEVELS 15

 struct virgl_screen;
@@ -25,7 +25,6 @@ include $(top_srcdir)/src/gallium/Automake.inc

 AM_CFLAGS = \
 	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
 	$(GALLIUM_WINSYS_CFLAGS) \
 	$(LIBDRM_CFLAGS)

@@ -2,5 +2,4 @@ C_SOURCES := \
 	virgl_drm_public.h \
 	virgl_drm_winsys.c \
 	virgl_drm_winsys.h \
-	virgl_hw.h \
 	virtgpu_drm.h
@@ -36,7 +36,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_context.h"

-#include "virgl_hw.h"
+#include "virgl/virgl_hw.h"
 #include "virgl/virgl_winsys.h"

 struct virgl_drm_winsys;
@@ -25,7 +25,6 @@ include $(top_srcdir)/src/gallium/Automake.inc

 AM_CFLAGS = \
 	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
 	$(GALLIUM_WINSYS_CFLAGS)

 noinst_LTLIBRARIES = libvirglvtest.la
@@ -28,7 +28,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 #include "state_tracker/sw_winsys.h"
-#include "virgl/drm/virgl_hw.h"
+#include "virgl/virgl_hw.h"
 #include "virgl/virgl_winsys.h"
 #include "util/list.h"
 #include "os/os_thread.h"