From e090a471efbe4a33442fc528842569581b8e8af4 Mon Sep 17 00:00:00 2001
From: Simon Zeni <simon.zeni@collabora.com>
Date: Tue, 7 May 2024 14:02:33 -0400
Subject: [PATCH 1/2] add meson build files

---
 meson.build       | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 meson_options.txt |  2 ++
 2 files changed, 52 insertions(+)
 create mode 100644 meson.build
 create mode 100644 meson_options.txt

diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..343fe48
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,50 @@
+project('libvivhook',
+	'c', 'cpp',
+	version: '1.0.0',
+	license: 'MIT',
+	default_options: [
+		'c_std=gnu99',
+	],
+)
+
+cc = meson.get_compiler('c')
+add_project_arguments(cc.get_supported_arguments([
+		'-feliminate-unused-debug-types',
+		'-Wnested-externs',
+		'-Wcast-qual',
+		'-Wredundant-decls',
+		'-Werror=write-strings',
+		'-Wshadow',
+]), language: ['c'])
+
+add_project_arguments([
+	'-D_GNU_SOURCE',
+], language: 'c')
+
+dl = cc.find_library('dl', required: true)
+galcore = declare_dependency(
+	include_directories: include_directories(get_option('galcore-include')),
+	link_args: ['-L'+ get_option('galcore-lib'), '-lGAL'],
+)
+
+vivhook_src = files(
+	'src/elf_hook.c',
+	'src/flightrecorder.cpp',
+	'src/viv_hook.c',
+)
+
+libvivhook = library('vivhook',
+	vivhook_src,
+	dependencies: [dl, galcore],
+)
+
+viv_interpose_src = vivhook_src + files(
+	'src/viv_interpose.c',
+)
+
+viv_interpose = shared_library('viv_interpose',
+	viv_interpose_src,
+	name_prefix: '',
+	dependencies: [dl, galcore],
+)
+
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..e58a39f
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,2 @@
+option('galcore-include', type: 'string')
+option('galcore-lib', type: 'string')

From 8eb5bee50a5f832fceabd428859ed721dce71c99 Mon Sep 17 00:00:00 2001
From: Simon Zeni <simon.zeni@collabora.com>
Date: Wed, 8 May 2024 13:55:23 -0400
Subject: [PATCH 2/2] add support for v6.4.3.p4.6 headers

---
 src/viv_hook.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/viv_hook.c b/src/viv_hook.c
index 1cfb1a4..813007d 100644
--- a/src/viv_hook.c
+++ b/src/viv_hook.c
@@ -190,7 +190,11 @@ static void log_queue(flightrec_event_t evctx, uint64_t queue_handle)
  * Assumes that the parent structure id was already added. */
 static void log_interface_in(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
 {
+#ifdef GCABI_SUBCOMMIT
+    struct _gcsHAL_COMMAND_LOCATION *cmdloc;
+#else
     struct _gcoCMDBUF *cmdbuf;
+#endif
 #ifndef GCABI_HAS_STATE_DELTAS
     struct _gcoCONTEXT *context;
 #endif
@@ -201,9 +205,17 @@ static void log_interface_in(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
         assert(id->u.Commit.count == 1);
         id->u.Commit.commandBuffer = id->u.Commit.commandBuffers[0]; /* HACK until dumper can handle multi-commit */
 #endif
+
+#ifdef GCABI_SUBCOMMIT
+        cmdloc = &id->u.Commit.subCommit.commandBuffer;
+        fdr_event_add_oneshot_range(evctx, cmdloc, sizeof(struct _gcsHAL_COMMAND_LOCATION));
+        fdr_event_add_oneshot_range(evctx, cmdloc->address + cmdloc->startOffset, cmdloc->address + cmdloc->size);
+#else
         cmdbuf = VIV_TO_PTR(id->u.Commit.commandBuffer, struct _gcoCMDBUF *);
         fdr_event_add_oneshot_range(evctx, cmdbuf, sizeof(struct _gcoCMDBUF));
         fdr_event_add_oneshot_range(evctx, VIV_TO_PTR(cmdbuf->logical,uint8_t*) + cmdbuf->startOffset, cmdbuf->offset - cmdbuf->startOffset);
+#endif
+
 #ifndef GCABI_HAS_STATE_DELTAS
         context = VIV_TO_PTR(id->u.Commit.contextBuffer, struct _gcoCONTEXT *);
         if (context) {
@@ -214,7 +226,12 @@ static void log_interface_in(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
                 fdr_event_add_oneshot_range(evctx, context->buffer, id->u.Commit.contextBuffer->bufferSize);
         }
 #endif
+
+#ifdef GCABI_SUBCOMMIT
+        log_queue(evctx, id->u.Commit.subCommit.queue);
+#else
         log_queue(evctx, id->u.Commit.queue);
+#endif
         break;
     case gcvHAL_EVENT_COMMIT:
         log_queue(evctx, id->u.Event.queue);
@@ -245,9 +262,11 @@ static void log_interface_in(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
             }
         }
         break;
+#ifndef GCABI_NO_ALLOCATE_CONTIGUOUS_MEMORY
     case gcvHAL_FREE_CONTIGUOUS_MEMORY:
         fdr_remove_monitored_range(_fdr, VIV_TO_PTR(id->u.FreeContiguousMemory.logical, void*), id->u.FreeContiguousMemory.bytes);
         break;
+#endif
     default:
         break;
     }
@@ -288,9 +307,11 @@ static void log_interface_out(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
             }
         }
         break;
+#ifndef GCABI_NO_ALLOCATE_CONTIGUOUS_MEMORY
     case gcvHAL_ALLOCATE_CONTIGUOUS_MEMORY:
         //fdr_add_monitored_range(_fdr, VIV_TO_PTR(id->u.AllocateContiguousMemory.logical, void*), id->u.AllocateContiguousMemory.bytes);
         break;
+#endif
     default:
         break;
     }