From ef3074afa7617b124cd223a8705b9459d7d7d66b Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Sat, 21 Sep 2019 18:17:38 +0100
Subject: [PATCH] aux/util: Add sink as tracker variable

---
 src/xrt/auxiliary/util/u_var.cpp | 8 ++------
 src/xrt/auxiliary/util/u_var.h   | 5 ++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/xrt/auxiliary/util/u_var.cpp b/src/xrt/auxiliary/util/u_var.cpp
index c46d4d678..4fb56c385 100644
--- a/src/xrt/auxiliary/util/u_var.cpp
+++ b/src/xrt/auxiliary/util/u_var.cpp
@@ -31,12 +31,7 @@ class Var
 public:
 	std::string name;
 	u_var_kind kind;
-	union {
-		void *ptr;
-		struct xrt_colour_rgb_u8 *rgb_u8;
-		struct xrt_colour_rgb_f32 *rgb_f32;
-		bool *boolean;
-	};
+	void *ptr;
 };
 
 class Obj
@@ -200,6 +195,7 @@ ADD_FUNC(i32, int32_t, I32);
 ADD_FUNC(f32, float, F32);
 ADD_FUNC(vec3_i32, struct xrt_vec3_i32, VEC3_I32);
 ADD_FUNC(vec3_f32, struct xrt_vec3, VEC3_F32);
+ADD_FUNC(sink, struct xrt_frame_sink *, SINK);
 ADD_FUNC(ro_text, const char, RO_TEXT);
 ADD_FUNC(ro_i32, int32_t, RO_I32);
 ADD_FUNC(ro_f32, float, RO_F32);
diff --git a/src/xrt/auxiliary/util/u_var.h b/src/xrt/auxiliary/util/u_var.h
index 185b5a573..ce623cd3a 100644
--- a/src/xrt/auxiliary/util/u_var.h
+++ b/src/xrt/auxiliary/util/u_var.h
@@ -16,6 +16,8 @@ extern "C" {
 #endif
 
 
+struct xrt_frame_sink;
+
 /*!
  * @ingroup aux_util
  * @{
@@ -26,7 +28,6 @@ extern "C" {
  */
 enum u_var_kind
 {
-
 	U_VAR_KIND_BOOL,
 	U_VAR_KIND_RGB_U8,
 	U_VAR_KIND_RGB_F32,
@@ -35,6 +36,7 @@ enum u_var_kind
 	U_VAR_KIND_F32,
 	U_VAR_KIND_VEC3_I32,
 	U_VAR_KIND_VEC3_F32,
+	U_VAR_KIND_SINK,
 	U_VAR_KIND_RO_TEXT,
 	U_VAR_KIND_RO_I32,
 	U_VAR_KIND_RO_F32,
@@ -114,6 +116,7 @@ ADD_FUNC(i32, int32_t, I32);
 ADD_FUNC(f32, float, F32);
 ADD_FUNC(vec3_i32, struct xrt_vec3_i32, VEC3_I32);
 ADD_FUNC(vec3_f32, struct xrt_vec3, VEC3_F32);
+ADD_FUNC(sink, struct xrt_frame_sink *, SINK);
 ADD_FUNC(ro_text, const char, RO_TEXT);
 ADD_FUNC(ro_i32, int32_t, RO_I32);
 ADD_FUNC(ro_f32, float, RO_F32);