Use EGL device extension in display initialization.
PATCH 1/2 Use EGL device extension in display initialization.
--- ui/egl-helpers.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-)
ui/egl-helpers.c +37 -4
@@ -1,6 +1,8 @@/* * Copyright (C) 2015-2016 Gerd Hoffmann <[email protected]> * +* Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either
@@ -351,11 +353,26 @@ static EGLDisplay qemu_egl_get_display(EGLNativeDisplayType native,EGLDisplay dpy =EGL_NO_DISPLAY ;/* In practise any EGL 1.5 implementation would support the EXT extension */ -if (epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_base" )) { +if (epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_base" ) + &&epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_device" ) + && (epoxy_has_egl_extension (NULL ,"EGL_EXT_device_base" ) + ||epoxy_has_egl_extension (NULL ,"EGL_EXT_device_enumeration" ))) {PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT = (void *)eglGetProcAddress ("eglGetPlatformDisplayEXT" );if (getPlatformDisplayEXT && platform !=0 ) { - dpy =getPlatformDisplayEXT (platform, native,NULL ); +if (platform ==EGL_PLATFORM_DEVICE_EXT ) { +static const int MAX_DEVICES =4 ; +EGLDeviceEXT eglDevs[MAX_DEVICES ]; +EGLint numDevices; + +PFNEGLQUERYDEVICESEXTPROC eglQueryDevicesEXT = + (PFNEGLQUERYDEVICESEXTPROC ) +eglGetProcAddress ("eglQueryDevicesEXT" ); +eglQueryDevicesEXT (MAX_DEVICES , eglDevs, &numDevices); + dpy =getPlatformDisplayEXT (platform, eglDevs[0 ],0 ); + }else { + dpy =getPlatformDisplayEXT (platform, native,NULL ); + } } }
@@ -388,6 +405,17 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy,EGL_ALPHA_SIZE ,0 , EGL_NONE, }; + +static const EGLint conf_att_pbuffer[] = { +EGL_SURFACE_TYPE ,EGL_PBUFFER_BIT , +EGL_RED_SIZE ,8 , +EGL_GREEN_SIZE ,8 , +EGL_BLUE_SIZE ,8 , +EGL_DEPTH_SIZE ,1 , +EGL_RENDERABLE_TYPE ,EGL_OPENGL_BIT , +EGL_NONE + }; +EGLint major, minor;EGLBoolean b;EGLint n;
@@ -413,8 +441,8 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy, } b =eglChooseConfig (qemu_egl_display, - gles ? conf_att_gles : conf_att_core, - &qemu_egl_config,1 , &n); + gles ? conf_att_gles : (platform ==EGL_PLATFORM_DEVICE_EXT ? conf_att_pbuffer : conf_att_core), + &qemu_egl_config,1 , &n);if (b ==EGL_FALSE || n !=1 ) {error_report ("egl: eglChooseConfig failed (%s mode)" , gles ?"gles" :"core" );
@@ -436,6 +464,11 @@ int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode)int qemu_egl_init_dpy_mesa (EGLNativeDisplayType dpy,DisplayGLMode mode) { +// Try EGL Device Extension +if (qemu_egl_init_dpy (dpy,EGL_PLATFORM_DEVICE_EXT , mode) ==0 ) { +return 0 ; + } +#ifdef EGL_MESA_platform_gbmreturn qemu_egl_init_dpy (dpy,EGL_PLATFORM_GBM_MESA , mode);#else
Signature · 1 line
2.17.1
PATCH 2/2 Add comment for qemu_egl_get_display
--- ui/egl-helpers.c | 4 ++++ 1 file changed, 4 insertions(+)
ui/egl-helpers.c +4 -0
@@ -346,6 +346,10 @@ EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType win)* We can workaround this (circular dependency) by probing for the EGL 1.5 * platform extensions (EGL_KHR_platform_gbm and friends) yet it doesn't seem * like mesa will be able to advertise these (even though it can do EGL 1.5). +* +* 5. It is worth adding an EGL_EXT_platform_device && (EGL_EXT_device_base || +* EGL_EXT_device_enumeration) extension check with the EGL_EXT_platform_base +* check before using the EGLDevice functionality. */ static EGLDisplay qemu_egl_get_display (EGLNativeDisplayType native,EGLenum platform)
Signature · 1 line
2.17.1
Quoted 33 lines · Eugene Huang
Signed-off-by Eugene Huang <[email protected]>--- ui/egl-helpers.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-)ui/egl-helpers.c +1
-0@@ -1,6 +1,8 @@/* * Copyright (C) 2015-2016 Gerd Hoffmann <[email protected]> * +* Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; eitherui/egl-helpers.c +0
-0@@ -351,11 +353,26 @@ static EGLDisplay qemu_egl_get_display(EGLNativeDisplayType native, EGLDisplay dpy = EGL_NO_DISPLAY;/* In practise any EGL 1.5 implementation would support the EXT extension */
ui/egl-helpers.c +4
-1-if (epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_base" )) { +if (epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_base" ) + &&epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_device" ) + && (epoxy_has_egl_extension (NULL ,"EGL_EXT_device_base" ) + ||epoxy_has_egl_extension (NULL ,"EGL_EXT_device_enumeration" ))) {PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT = (void *)eglGetProcAddress ("eglGetPlatformDisplayEXT" );
ui/egl-helpers.c static EGLDisplay qemu_egl_get_display(EGLNativeDisplayType native, · line 370
Quoted 10 lines
ui/egl-helpers.c +8
-1if (getPlatformDisplayEXT && platform !=0 ) { - dpy =getPlatformDisplayEXT (platform, native,NULL ); +if (platform ==EGL_PLATFORM_DEVICE_EXT ) { +static const int MAX_DEVICES =4 ; +EGLDeviceEXT eglDevs[MAX_DEVICES ]; +EGLint numDevices; + +PFNEGLQUERYDEVICESEXTPROC eglQueryDevicesEXT = + (PFNEGLQUERYDEVICESEXTPROC ) +eglGetProcAddress ("eglQueryDevicesEXT" );
It should handle the case where returned eglQueryDevicesEXT is NULL.
+ eglQueryDevicesEXT(MAX_DEVICES, eglDevs, &numDevices);
Quoted 1 line
You need to handle the success return value, as well as the case where numDevices == 0.
(surprisingly, we don't need to care about memory of eglDevs?)
Quoted 54 lines
ui/egl-helpers.c +17
-2+ dpy =getPlatformDisplayEXT (platform, eglDevs[0 ],0 ); + }else { + dpy =getPlatformDisplayEXT (platform, native,NULL ); + } } }@@ -388,6 +405,17 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy,EGL_ALPHA_SIZE ,0 , EGL_NONE, }; + +static const EGLint conf_att_pbuffer[] = { +EGL_SURFACE_TYPE ,EGL_PBUFFER_BIT , +EGL_RED_SIZE ,8 , +EGL_GREEN_SIZE ,8 , +EGL_BLUE_SIZE ,8 , +EGL_DEPTH_SIZE ,1 , +EGL_RENDERABLE_TYPE ,EGL_OPENGL_BIT , +EGL_NONE + }; +EGLint major, minor;EGLBoolean b;EGLint n;@@ -413,8 +441,8 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy, } b =eglChooseConfig (qemu_egl_display, - gles ? conf_att_gles : conf_att_core, - &qemu_egl_config,1 , &n); + gles ? conf_att_gles : (platform ==EGL_PLATFORM_DEVICE_EXT ? conf_att_pbuffer : conf_att_core), + &qemu_egl_config,1 , &n);if (b ==EGL_FALSE || n !=1 ) { error_report("egl: eglChooseConfig failed (%s mode)",gles ? "gles" : "core");ui/egl-helpers.c +5
-0@@ -436,6 +464,11 @@ int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode)int qemu_egl_init_dpy_mesa (EGLNativeDisplayType dpy,DisplayGLMode mode) { +// Try EGL Device Extension +if (qemu_egl_init_dpy (dpy,EGL_PLATFORM_DEVICE_EXT , mode) ==0 ) { +return 0 ; + } +#ifdef EGL_MESA_platform_gbmreturn qemu_egl_init_dpy (dpy,EGL_PLATFORM_GBM_MESA , mode);#else
--
2.17.1
Signature · 1 line
Marc-André Lureau
Thanks for the comment. I will submit another patch.
Best regards,
Eugene
From: Marc-André Lureau <[email protected]>
Sent: Monday, August 30, 2021 7:01 AM
To: Eugene Huang <[email protected]>; Gerd Hoffmann <[email protected]>
Cc: QEMU <[email protected]>
Subject: Re: [PATCH 1/2] Use EGL device extension in display initialization.
External email: Use caution opening links or attachments
On Wed, Aug 25, 2021 at 2:22 AM Eugene Huang <[email protected]<mailto:[email protected]>> wrote:
--- ui/egl-helpers.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-)
ui/egl-helpers.c +14 -2
@@ -1,6 +1,8 @@/* * Copyright (C) 2015-2016 Gerd Hoffmann <[email protected]<mailto:[email protected]>> * +* Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +* * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either
@@ -351,11 +353,26 @@ static EGLDisplay qemu_egl_get_display(EGLNativeDisplayType native,EGLDisplay dpy =EGL_NO_DISPLAY ;/* In practise any EGL 1.5 implementation would support the EXT extension */ -if (epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_base" )) { +if (epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_base" ) + &&epoxy_has_egl_extension (NULL ,"EGL_EXT_platform_device" ) + && (epoxy_has_egl_extension (NULL ,"EGL_EXT_device_base" ) + ||epoxy_has_egl_extension (NULL ,"EGL_EXT_device_enumeration" ))) {PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT = (void *)eglGetProcAddress ("eglGetPlatformDisplayEXT" );if (getPlatformDisplayEXT && platform !=0 ) { - dpy =getPlatformDisplayEXT (platform, native,NULL ); +if (platform ==EGL_PLATFORM_DEVICE_EXT ) { +static const int MAX_DEVICES =4 ; +EGLDeviceEXT eglDevs[MAX_DEVICES ]; +EGLint numDevices; + +PFNEGLQUERYDEVICESEXTPROC eglQueryDevicesEXT = + (PFNEGLQUERYDEVICESEXTPROC ) +eglGetProcAddress ("eglQueryDevicesEXT" );
It should handle the case where returned eglQueryDevicesEXT is NULL.
+ eglQueryDevicesEXT(MAX_DEVICES, eglDevs, &numDevices);
You need to handle the success return value, as well as the case where numDevices == 0.
(surprisingly, we don't need to care about memory of eglDevs?)
+ dpy = getPlatformDisplayEXT(platform, eglDevs[0], 0);
+ } else {
+ dpy = getPlatformDisplayEXT(platform, native, NULL);
+ }
}
}@@ -388,6 +405,17 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy,
EGL_ALPHA_SIZE, 0,
EGL_NONE,
};
+
+ static const EGLint conf_att_pbuffer[] = {
+ EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+ EGL_RED_SIZE, 8,
+ EGL_GREEN_SIZE, 8,
+ EGL_BLUE_SIZE, 8,
+ EGL_DEPTH_SIZE, 1,
+ EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+ EGL_NONE
+ };
+
EGLint major, minor;
EGLBoolean b;
EGLint n;@@ -413,8 +441,8 @@ static int qemu_egl_init_dpy(EGLNativeDisplayType dpy,
}
b = eglChooseConfig(qemu_egl_display,
- gles ? conf_att_gles : conf_att_core,
- &qemu_egl_config, 1, &n);
+ gles ? conf_att_gles : (platform == EGL_PLATFORM_DEVICE_EXT ? conf_att_pbuffer : conf_att_core),
+ &qemu_egl_config, 1, &n);
if (b == EGL_FALSE || n != 1) {
error_report("egl: eglChooseConfig failed (%s mode)",
gles ? "gles" : "core");@@ -436,6 +464,11 @@ int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode)
int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode) {
+ // Try EGL Device Extension
+ if (qemu_egl_init_dpy(dpy, EGL_PLATFORM_DEVICE_EXT, mode) == 0) {
+ return 0;
+ }
+
#ifdef EGL_MESA_platform_gbm
return qemu_egl_init_dpy(dpy, EGL_PLATFORM_GBM_MESA, mode); #else
--
2.17.1
--
Marc-André Lureau