etnaviv: include kernel headers in gcabi.h

This makes it easier to see which headers are actually required.

14 files changed, 97 insertions, 44 deletions

diff --git a/native/etnaviv/etna.c b/native/etnaviv/etna.c
index f54f556..93af9cb 100644
--- a/native/etnaviv/etna.c
+++ b/native/etnaviv/etna.c
@@ -31,15 +31,6 @@
 #include <stdio.h>
 
 #include "gc_abi.h"
-#include "gc_hal_base.h"
-#include "gc_hal.h"
-#include "gc_hal_driver.h"
-#ifdef GCABI_HAS_CONTEXT
-#include "gc_hal_user_context.h"
-#else
-#include "gc_hal_kernel_buffer.h"
-#endif
-#include "gc_hal_types.h"
 
 #include "viv_internal.h"
 
diff --git a/native/etnaviv/etna_mem.c b/native/etnaviv/etna_mem.c
index f7bec6a..bac6dbd 100644
--- a/native/etnaviv/etna_mem.c
+++ b/native/etnaviv/etna_mem.c
@@ -29,15 +29,6 @@
 #include <stdio.h>
 
 #include "gc_abi.h"
-#include "gc_hal_base.h"
-#include "gc_hal.h"
-#include "gc_hal_driver.h"
-#ifdef GCABI_HAS_CONTEXT
-#include "gc_hal_user_context.h"
-#else
-#include "gc_hal_kernel_buffer.h"
-#endif
-#include "gc_hal_types.h"
 
 //#define DEBUG
 #define ETNA_VIDMEM_ALIGNMENT (0x40)
diff --git a/native/etnaviv/etna_queue.c b/native/etnaviv/etna_queue.c
index 4034ed4..c874087 100644
--- a/native/etnaviv/etna_queue.c
+++ b/native/etnaviv/etna_queue.c
@@ -3,14 +3,6 @@
 #include <etnaviv/viv.h>
 
 #include "gc_abi.h"
-#include "gc_hal_base.h"
-#include "gc_hal.h"
-#include "gc_hal_driver.h"
-#ifdef GCABI_HAS_CONTEXT
-#include "gc_hal_user_context.h"
-#else
-#include "gc_hal_kernel_buffer.h"
-#endif
 #include "viv_internal.h"
 
 #include <assert.h>
diff --git a/native/etnaviv/viv.c b/native/etnaviv/viv.c
index 76afb8c..3df7f31 100644
--- a/native/etnaviv/viv.c
+++ b/native/etnaviv/viv.c
@@ -35,15 +35,6 @@
 #include <string.h>
 
 #include "gc_abi.h"
-#include "gc_hal_base.h"
-#include "gc_hal.h"
-#include "gc_hal_driver.h"
-#ifdef GCABI_HAS_CONTEXT
-#include "gc_hal_user_context.h"
-#else
-#include "gc_hal_kernel_buffer.h"
-#endif
-#include "gc_hal_types.h"
 #include "viv_internal.h"
 
 #ifdef ETNAVIV_HOOK
diff --git a/native/etnaviv/viv_profile.c b/native/etnaviv/viv_profile.c
index 0504c91..7772e36 100644
--- a/native/etnaviv/viv_profile.c
+++ b/native/etnaviv/viv_profile.c
@@ -3,15 +3,6 @@
 #include <etnaviv/viv.h>
 
 #include "gc_abi.h"
-#include "gc_hal_base.h"
-#include "gc_hal.h"
-#include "gc_hal_driver.h"
-#ifdef GCABI_HAS_CONTEXT
-#include "gc_hal_user_context.h"
-#else
-#include "gc_hal_kernel_buffer.h"
-#endif
-#include "gc_hal_types.h"
 
 static struct viv_profile_counter_info viv_profile_counters[] = {
     [VIV_PROF_GPU_CYCLES_COUNTER] = {"GPU_CYCLES_COUNTER", "GPU cycles counter"},
diff --git a/native/include_arnova/gc_abi.h b/native/include_arnova/gc_abi.h
index 7f40dec..efc2365 100644
--- a/native/include_arnova/gc_abi.h
+++ b/native/include_arnova/gc_abi.h
@@ -21,6 +21,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
+
 //#define GCABI_USER_SIGNAL_HAS_TYPE
 #define GCABI_CONTEXT_HAS_PHYSICAL
 #define GCABI_HAS_MINOR_FEATURES_2
@@ -40,3 +43,16 @@ typedef struct
 } vivante_ioctl_data_t;
 
 #define _gcs2D_PROFILE gcs2D_PROFILE
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#ifdef GCABI_HAS_CONTEXT
+#include "gc_hal_user_context.h"
+#else
+#include "gc_hal_kernel_buffer.h"
+#endif
+#include "gc_hal_types.h"
+
+#endif
+
diff --git a/native/include_dove/gc_abi.h b/native/include_dove/gc_abi.h
index d3acea9..6736a82 100644
--- a/native/include_dove/gc_abi.h
+++ b/native/include_dove/gc_abi.h
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
 #define GCABI_USER_SIGNAL_HAS_TYPE
 //#define GCABI_CONTEXT_HAS_PHYSICAL
 //#define GCABI_HAS_MINOR_FEATURES_2
@@ -40,3 +42,12 @@ typedef struct
 } vivante_ioctl_data_t;
 
 #define _gcs2D_PROFILE gcs2D_PROFILE
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#include "gc_hal_user_context.h"
+#include "gc_hal_types.h"
+
+#endif
+
diff --git a/native/include_dove_old/gc_abi.h b/native/include_dove_old/gc_abi.h
index 379acc7..78b3564 100644
--- a/native/include_dove_old/gc_abi.h
+++ b/native/include_dove_old/gc_abi.h
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
 //#define GCABI_USER_SIGNAL_HAS_TYPE
 #define GCABI_CONTEXT_HAS_PHYSICAL
 //#define GCABI_HAS_MINOR_FEATURES_2
@@ -40,3 +42,11 @@ typedef struct
 } vivante_ioctl_data_t;
 
 #define _gcs2D_PROFILE gcs2D_PROFILE
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#include "gc_hal_user_context.h"
+#include "gc_hal_types.h"
+#endif
+
diff --git a/native/include_eureka/gc_abi.h b/native/include_eureka/gc_abi.h
index f4b5601..91b6992 100644
--- a/native/include_eureka/gc_abi.h
+++ b/native/include_eureka/gc_abi.h
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
 //#define GCABI_USER_SIGNAL_HAS_TYPE
 //#define GCABI_CONTEXT_HAS_PHYSICAL
 #define GCABI_HAS_MINOR_FEATURES_2
@@ -42,3 +44,11 @@ typedef struct
     void *out_buf;
     unsigned int out_buf_size;
 } vivante_ioctl_data_t;
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#include "gc_hal_kernel_buffer.h"
+#include "gc_hal_types.h"
+#endif
+
diff --git a/native/include_imx6/gc_abi.h b/native/include_imx6/gc_abi.h
index 04f1e8c..37460ef 100644
--- a/native/include_imx6/gc_abi.h
+++ b/native/include_imx6/gc_abi.h
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
 //#define GCABI_USER_SIGNAL_HAS_TYPE
 //#define GCABI_CONTEXT_HAS_PHYSICAL
 #define GCABI_HAS_MINOR_FEATURES_2
@@ -44,3 +46,11 @@ typedef struct
     void *out_buf;
     unsigned int out_buf_size;
 } vivante_ioctl_data_t;
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#include "gc_hal_kernel_buffer.h"
+#include "gc_hal_types.h"
+#endif
+
diff --git a/native/include_imx6_v4_0_0/gc_abi.h b/native/include_imx6_v4_0_0/gc_abi.h
index 9988faa..81ffc98 100644
--- a/native/include_imx6_v4_0_0/gc_abi.h
+++ b/native/include_imx6_v4_0_0/gc_abi.h
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
 //#define GCABI_USER_SIGNAL_HAS_TYPE
 //#define GCABI_CONTEXT_HAS_PHYSICAL
 #define GCABI_HAS_MINOR_FEATURES_2
@@ -48,3 +50,11 @@ typedef struct
     unsigned long long *out_buf;
     unsigned long long out_buf_size;
 } vivante_ioctl_data_t;
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#include "gc_hal_kernel_buffer.h"
+#include "gc_hal_types.h"
+#endif
+
diff --git a/native/include_v2/gc_abi.h b/native/include_v2/gc_abi.h
index 7f40dec..03a02cd 100644
--- a/native/include_v2/gc_abi.h
+++ b/native/include_v2/gc_abi.h
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
 //#define GCABI_USER_SIGNAL_HAS_TYPE
 #define GCABI_CONTEXT_HAS_PHYSICAL
 #define GCABI_HAS_MINOR_FEATURES_2
@@ -40,3 +42,11 @@ typedef struct
 } vivante_ioctl_data_t;
 
 #define _gcs2D_PROFILE gcs2D_PROFILE
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#include "gc_hal_user_context.h"
+#include "gc_hal_types.h"
+#endif
+
diff --git a/native/include_v4/gc_abi.h b/native/include_v4/gc_abi.h
index a8419b9..d04a79a 100644
--- a/native/include_v4/gc_abi.h
+++ b/native/include_v4/gc_abi.h
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
 //#define GCABI_USER_SIGNAL_HAS_TYPE
 //#define GCABI_CONTEXT_HAS_PHYSICAL
 #define GCABI_HAS_MINOR_FEATURES_2
@@ -42,3 +44,11 @@ typedef struct
     void *out_buf;
     unsigned int out_buf_size;
 } vivante_ioctl_data_t;
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#include "gc_hal_kernel_buffer.h"
+#include "gc_hal_types.h"
+#endif
+
diff --git a/native/include_v4_uapi/gc_abi.h b/native/include_v4_uapi/gc_abi.h
index a8419b9..d04a79a 100644
--- a/native/include_v4_uapi/gc_abi.h
+++ b/native/include_v4_uapi/gc_abi.h
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 /** Kernel ABI definition file for Etna **/
+#ifndef H_GCABI
+#define H_GCABI
 //#define GCABI_USER_SIGNAL_HAS_TYPE
 //#define GCABI_CONTEXT_HAS_PHYSICAL
 #define GCABI_HAS_MINOR_FEATURES_2
@@ -42,3 +44,11 @@ typedef struct
     void *out_buf;
     unsigned int out_buf_size;
 } vivante_ioctl_data_t;
+
+#include "gc_hal_base.h"
+#include "gc_hal.h"
+#include "gc_hal_driver.h"
+#include "gc_hal_kernel_buffer.h"
+#include "gc_hal_types.h"
+#endif
+