diff options
Diffstat (limited to '0001-gl-renderer-Add-EGLDevice-enumeration-support.patch')
| -rw-r--r-- | 0001-gl-renderer-Add-EGLDevice-enumeration-support.patch | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/0001-gl-renderer-Add-EGLDevice-enumeration-support.patch b/0001-gl-renderer-Add-EGLDevice-enumeration-support.patch index bd66c116b69c..6eadeff3a9bc 100644 --- a/0001-gl-renderer-Add-EGLDevice-enumeration-support.patch +++ b/0001-gl-renderer-Add-EGLDevice-enumeration-support.patch @@ -1,8 +1,7 @@ -From 368a44faef065d4c45415f13c9b51be0d618b3d5 Mon Sep 17 00:00:00 2001 +From 3cf008cf8b11488e07f3008ab32ce1d43b004914 Mon Sep 17 00:00:00 2001 From: "Miguel A. Vico" <mvicomoya@nvidia.com> Date: Mon, 2 May 2016 15:56:37 +0200 Subject: [PATCH 1/6] gl-renderer: Add EGLDevice enumeration support -X-NVConfidentiality: public EGLDevice provides means to enumerate native devices. @@ -17,15 +16,15 @@ Reviewed-by: Andy Ritger <aritger@nvidia.com> Reviewed-by: Adam Cheney <acheney@nvidia.com> Reviewed-by: James Jones <jajones@nvidia.com> --- - libweston/gl-renderer.c | 89 ++++++++++++++++++++++++++++++++++++++++- - libweston/gl-renderer.h | 8 ++++ - 2 files changed, 96 insertions(+), 1 deletion(-) + libweston/renderer-gl/gl-renderer.c | 86 +++++++++++++++++++++++++++++ + libweston/renderer-gl/gl-renderer.h | 8 +++ + 2 files changed, 94 insertions(+) -diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c -index a03e45ea..74315347 100644 ---- a/libweston/gl-renderer.c -+++ b/libweston/gl-renderer.c -@@ -3990,6 +3990,90 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface) +diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c +index d5bfe830..0c9e197a 100644 +--- a/libweston/renderer-gl/gl-renderer.c ++++ b/libweston/renderer-gl/gl-renderer.c +@@ -3804,6 +3804,90 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface) return 0; } @@ -114,23 +113,20 @@ index a03e45ea..74315347 100644 +} + WL_EXPORT struct gl_renderer_interface gl_renderer_interface = { - .opaque_attribs = gl_renderer_opaque_attribs, - .alpha_attribs = gl_renderer_alpha_attribs, -@@ -4001,5 +4085,8 @@ WL_EXPORT struct gl_renderer_interface gl_renderer_interface = { - .output_surface = gl_renderer_output_surface, + .display_create = gl_renderer_display_create, + .output_window_create = gl_renderer_output_window_create, +@@ -3811,4 +3895,6 @@ WL_EXPORT struct gl_renderer_interface gl_renderer_interface = { + .output_destroy = gl_renderer_output_destroy, .output_set_border = gl_renderer_output_set_border, .create_fence_fd = gl_renderer_create_fence_fd, -- .print_egl_error_state = gl_renderer_print_egl_error_state -+ .print_egl_error_state = gl_renderer_print_egl_error_state, -+ + .get_devices = gl_renderer_get_devices, + .get_drm_device_file = gl_renderer_get_drm_device_file }; -diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h -index 202702b5..151879da 100644 ---- a/libweston/gl-renderer.h -+++ b/libweston/gl-renderer.h -@@ -38,6 +38,7 @@ +diff --git a/libweston/renderer-gl/gl-renderer.h b/libweston/renderer-gl/gl-renderer.h +index 1430bb14..80c3379b 100644 +--- a/libweston/renderer-gl/gl-renderer.h ++++ b/libweston/renderer-gl/gl-renderer.h +@@ -40,6 +40,7 @@ typedef int EGLint; typedef int EGLenum; @@ -138,10 +134,10 @@ index 202702b5..151879da 100644 typedef void *EGLDisplay; typedef void *EGLSurface; typedef void *EGLConfig; -@@ -121,5 +122,12 @@ struct gl_renderer_interface { +@@ -218,4 +219,11 @@ struct gl_renderer_interface { + * EGL_ANDROID_native_fence_sync extension. + */ int (*create_fence_fd)(struct weston_output *output); - - void (*print_egl_error_state)(void); + + int (*get_devices)(EGLint max_devices, + EGLDeviceEXT *devices, @@ -150,7 +146,6 @@ index 202702b5..151879da 100644 + int (*get_drm_device_file)(EGLDeviceEXT device, + const char **drm_device_file); }; - -- -2.21.0 +2.25.1 |