From 5fbbec9aae8185b96aa4cf6d778901dea44fefa4 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 10 Jun 2015 12:47:56 -0700
Subject: [PATCH] vc4: Move vc4_packet.h to the kernel/ directory, since it's
 also shared.

I want to notice discrepancies when I diff -u between Mesa and the kernel.
---
 src/gallium/drivers/vc4/Makefile.sources          | 2 +-
 src/gallium/drivers/vc4/{ => kernel}/vc4_packet.h | 0
 src/gallium/drivers/vc4/vc4_cl.h                  | 2 +-
 src/gallium/drivers/vc4/vc4_resource.h            | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/gallium/drivers/vc4/{ => kernel}/vc4_packet.h (100%)

diff --git a/src/gallium/drivers/vc4/Makefile.sources b/src/gallium/drivers/vc4/Makefile.sources
index f678b2f..edef493 100644
--- a/src/gallium/drivers/vc4/Makefile.sources
+++ b/src/gallium/drivers/vc4/Makefile.sources
@@ -1,6 +1,7 @@
 C_SOURCES := \
 	kernel/vc4_drv.h \
 	kernel/vc4_gem.c \
+	kernel/vc4_packet.h \
 	kernel/vc4_validate.c \
 	kernel/vc4_validate_shaders.c \
 	vc4_blit.c \
@@ -24,7 +25,6 @@ C_SOURCES := \
 	vc4_opt_dead_code.c \
 	vc4_opt_small_immediates.c \
 	vc4_opt_vpm_writes.c \
-	vc4_packet.h \
 	vc4_program.c \
 	vc4_qir.c \
 	vc4_qir_lower_uniforms.c \
diff --git a/src/gallium/drivers/vc4/vc4_packet.h b/src/gallium/drivers/vc4/kernel/vc4_packet.h
similarity index 100%
rename from src/gallium/drivers/vc4/vc4_packet.h
rename to src/gallium/drivers/vc4/kernel/vc4_packet.h
diff --git a/src/gallium/drivers/vc4/vc4_cl.h b/src/gallium/drivers/vc4/vc4_cl.h
index 32a2e71..4a50e79 100644
--- a/src/gallium/drivers/vc4/vc4_cl.h
+++ b/src/gallium/drivers/vc4/vc4_cl.h
@@ -29,7 +29,7 @@
 #include "util/u_math.h"
 #include "util/macros.h"
 
-#include "vc4_packet.h"
+#include "kernel/vc4_packet.h"
 
 struct vc4_bo;
 
diff --git a/src/gallium/drivers/vc4/vc4_resource.h b/src/gallium/drivers/vc4/vc4_resource.h
index b3cba8f..a81c470 100644
--- a/src/gallium/drivers/vc4/vc4_resource.h
+++ b/src/gallium/drivers/vc4/vc4_resource.h
@@ -26,7 +26,7 @@
 #define VC4_RESOURCE_H
 
 #include "vc4_screen.h"
-#include "vc4_packet.h"
+#include "kernel/vc4_packet.h"
 #include "util/u_transfer.h"
 
 struct vc4_transfer {
-- 
2.7.4