Move card path to egl struct, use egl struct for monitor enumeration

4 files changed, 0 insertions, 11 deletions

diff --git a/include/capture/kms_cuda.h b/include/capture/kms_cuda.h
index c2b2ad8..14ed333 100644
--- a/include/capture/kms_cuda.h
+++ b/include/capture/kms_cuda.h
@@ -11,7 +11,6 @@ typedef struct {
     gsr_egl *egl;
     const char *display_to_capture; /* if this is "screen", then the first monitor is captured. A copy is made of this */
     gsr_gpu_info gpu_inf;
-    const char *card_path; /* reference */
 } gsr_capture_kms_cuda_params;
 
 gsr_capture* gsr_capture_kms_cuda_create(const gsr_capture_kms_cuda_params *params);
diff --git a/include/capture/kms_vaapi.h b/include/capture/kms_vaapi.h
index b7fbb81..b670a0d 100644
--- a/include/capture/kms_vaapi.h
+++ b/include/capture/kms_vaapi.h
@@ -12,7 +12,6 @@ typedef struct {
     gsr_egl *egl;
     const char *display_to_capture; /* if this is "screen", then the first monitor is captured. A copy is made of this */
     gsr_gpu_info gpu_inf;
-    const char *card_path; /* reference */
     bool wayland;
     bool hdr;
     gsr_color_range color_range;
diff --git a/include/capture/xcomposite_cuda.h b/include/capture/xcomposite_cuda.h
index 2106714..53b7c0d 100644
--- a/include/capture/xcomposite_cuda.h
+++ b/include/capture/xcomposite_cuda.h
@@ -4,13 +4,9 @@
 #include "capture.h"
 #include "../egl.h"
 #include "../vec2.h"
-#include <X11/X.h>
-
-typedef struct _XDisplay Display;
 
 typedef struct {
     gsr_egl *egl;
-    Display *dpy;
     Window window;
     bool follow_focused; /* If this is set then |window| is ignored */
     vec2i region_size; /* This is currently only used with |follow_focused| */
diff --git a/include/capture/xcomposite_vaapi.h b/include/capture/xcomposite_vaapi.h
index ba234ec..c6237e3 100644
--- a/include/capture/xcomposite_vaapi.h
+++ b/include/capture/xcomposite_vaapi.h
@@ -5,17 +5,12 @@
 #include "../egl.h"
 #include "../vec2.h"
 #include "../color_conversion.h"
-#include <X11/X.h>
-
-typedef struct _XDisplay Display;
 
 typedef struct {
     gsr_egl *egl;
-    Display *dpy;
     Window window;
     bool follow_focused; /* If this is set then |window| is ignored */
     vec2i region_size; /* This is currently only used with |follow_focused| */
-    const char *card_path; /* reference */
     gsr_color_range color_range;
 } gsr_capture_xcomposite_vaapi_params;