Mesa (master): virgl: clean up virgl_transfer_queue.h

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 308ba2c0f92e4ad0584b02c06bcd27fcabc33196
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=308ba2c0f92e4ad0584b02c06bcd27fcabc33196

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Wed May 15 16:01:02 2019 -0700

virgl: clean up virgl_transfer_queue.h

Add header guard and forward declare structs.  Move virgl_resource.h
inclusion to the C file.

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis at collabora.com>

---

 src/gallium/drivers/virgl/virgl_transfer_queue.c |  1 +
 src/gallium/drivers/virgl/virgl_transfer_queue.h | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/virgl/virgl_transfer_queue.c b/src/gallium/drivers/virgl/virgl_transfer_queue.c
index f3785e99766..da2eda41b6a 100644
--- a/src/gallium/drivers/virgl/virgl_transfer_queue.c
+++ b/src/gallium/drivers/virgl/virgl_transfer_queue.c
@@ -27,6 +27,7 @@
 #include "virgl_protocol.h"
 #include "virgl_screen.h"
 #include "virgl_encode.h"
+#include "virgl_resource.h"
 #include "virgl_transfer_queue.h"
 
 struct list_action_args
diff --git a/src/gallium/drivers/virgl/virgl_transfer_queue.h b/src/gallium/drivers/virgl/virgl_transfer_queue.h
index 403a0f1f4d7..be02596a9a7 100644
--- a/src/gallium/drivers/virgl/virgl_transfer_queue.h
+++ b/src/gallium/drivers/virgl/virgl_transfer_queue.h
@@ -21,7 +21,16 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "virgl_resource.h"
+#ifndef VIRGL_TRANSFER_QUEUE_H
+#define VIRGL_TRANSFER_QUEUE_H
+
+#include "pipe/p_defines.h"
+#include "util/list.h"
+
+struct virgl_cmd_buf;
+struct virgl_screen;
+struct virgl_slab_child_pool;
+struct virgl_transfer;
 
 enum virgl_transfer_queue_lists {
    PENDING_LIST = 0,
@@ -58,3 +67,5 @@ bool virgl_transfer_queue_is_queued(struct virgl_transfer_queue *queue,
  */
 struct virgl_transfer * virgl_transfer_queue_extend(
    struct virgl_transfer_queue *queue, struct virgl_transfer *transfer);
+
+#endif /* VIRGL_TRANSFER_QUEUE_H */