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>

diff --git a/src/gallium/drivers/virgl/Makefile.sources b/src/gallium/drivers/virgl/Makefile.sources
index df010c0..ed309ae 100644 (file)
--- a/src/gallium/drivers/virgl/Makefile.sources
+++ b/src/gallium/drivers/virgl/Makefile.sources
@@ -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 \

diff --git a/src/gallium/drivers/virgl/virgl.h b/src/gallium/drivers/virgl/virgl.h
index ecd997b..d64576c 100644 (file)
--- a/src/gallium/drivers/virgl/virgl.h
+++ b/src/gallium/drivers/virgl/virgl.h
@@ -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"

diff --git a/src/gallium/winsys/virgl/drm/virgl_hw.h b/src/gallium/drivers/virgl/virgl_hw.h
similarity index 100%
rename from src/gallium/winsys/virgl/drm/virgl_hw.h
rename to src/gallium/drivers/virgl/virgl_hw.h

diff --git a/src/gallium/drivers/virgl/virgl_resource.h b/src/gallium/drivers/virgl/virgl_resource.h
index b80545e..2d0bd8b 100644 (file)
--- a/src/gallium/drivers/virgl/virgl_resource.h
+++ b/src/gallium/drivers/virgl/virgl_resource.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;

diff --git a/src/gallium/winsys/virgl/drm/Makefile.am b/src/gallium/winsys/virgl/drm/Makefile.am
index 9c1db31..2473b88 100644 (file)
--- a/src/gallium/winsys/virgl/drm/Makefile.am
+++ b/src/gallium/winsys/virgl/drm/Makefile.am
@@ -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)
 

diff --git a/src/gallium/winsys/virgl/drm/Makefile.sources b/src/gallium/winsys/virgl/drm/Makefile.sources
index eca8eb6..0430d4a 100644 (file)
--- a/src/gallium/winsys/virgl/drm/Makefile.sources
+++ b/src/gallium/winsys/virgl/drm/Makefile.sources
@@ -2,5 +2,4 @@ C_SOURCES := \
        virgl_drm_public.h \
        virgl_drm_winsys.c \
        virgl_drm_winsys.h \
-       virgl_hw.h \
        virtgpu_drm.h

diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
index c9b25a0..eac1d3e 100644 (file)
--- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
+++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.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;

diff --git a/src/gallium/winsys/virgl/vtest/Makefile.am b/src/gallium/winsys/virgl/vtest/Makefile.am
index 827b353..b15a3af 100644 (file)
--- a/src/gallium/winsys/virgl/vtest/Makefile.am
+++ b/src/gallium/winsys/virgl/vtest/Makefile.am
@@ -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

diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
index 2f9dc84..6d0e7b0 100644 (file)
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
@@ -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"