Refactor xcomposite

Move common code between cuda/vaapi implementations
into xcomposite file.
This also fixes limited/full range colors on nvidia.

1 files changed, 2 insertions, 8 deletions

diff --git a/include/capture/xcomposite_vaapi.h b/include/capture/xcomposite_vaapi.h
index c6237e3..5d4b338 100644
--- a/include/capture/xcomposite_vaapi.h
+++ b/include/capture/xcomposite_vaapi.h
@@ -2,16 +2,10 @@
 #define GSR_CAPTURE_XCOMPOSITE_VAAPI_H
 
 #include "capture.h"
-#include "../egl.h"
-#include "../vec2.h"
-#include "../color_conversion.h"
+#include "xcomposite.h"
 
 typedef struct {
-    gsr_egl *egl;
-    Window window;
-    bool follow_focused; /* If this is set then |window| is ignored */
-    vec2i region_size; /* This is currently only used with |follow_focused| */
-    gsr_color_range color_range;
+    gsr_capture_xcomposite_params base;
 } gsr_capture_xcomposite_vaapi_params;
 
 gsr_capture* gsr_capture_xcomposite_vaapi_create(const gsr_capture_xcomposite_vaapi_params *params);