[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/33] ui/egl: query ANGLE d3d device
From: |
marcandre . lureau |
Subject: |
[PULL 30/33] ui/egl: query ANGLE d3d device |
Date: |
Tue, 27 Jun 2023 15:02:27 +0200 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Check if ANGLE is being used with D3D backend.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230606115658.677673-19-marcandre.lureau@redhat.com>
---
include/ui/egl-helpers.h | 1 +
ui/egl-helpers.c | 32 +++++++++++++++++++++++++++++++-
ui/trace-events | 3 +++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
index 6e2f0c49a6..4b8c0d2281 100644
--- a/include/ui/egl-helpers.h
+++ b/include/ui/egl-helpers.h
@@ -12,6 +12,7 @@
extern EGLDisplay *qemu_egl_display;
extern EGLConfig qemu_egl_config;
extern DisplayGLMode qemu_egl_mode;
+extern bool qemu_egl_angle_d3d;
typedef struct egl_fb {
int width;
diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index f38800e920..8f9fbf583e 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -15,16 +15,19 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
+
#include "qemu/drm.h"
#include "qemu/error-report.h"
#include "ui/console.h"
#include "ui/egl-helpers.h"
#include "sysemu/sysemu.h"
#include "qapi/error.h"
+#include "trace.h"
EGLDisplay *qemu_egl_display;
EGLConfig qemu_egl_config;
DisplayGLMode qemu_egl_mode;
+bool qemu_egl_angle_d3d;
/* ------------------------------------------------------------------ */
@@ -553,7 +556,34 @@ int qemu_egl_init_dpy_win32(EGLNativeDisplayType dpy,
DisplayGLMode mode)
if (mode == DISPLAYGL_MODE_ON) {
mode = DISPLAYGL_MODE_ES;
}
- return qemu_egl_init_dpy(dpy, 0, mode);
+
+ if (qemu_egl_init_dpy(dpy, 0, mode) < 0) {
+ return -1;
+ }
+
+#ifdef EGL_D3D11_DEVICE_ANGLE
+ if (epoxy_has_egl_extension(qemu_egl_display, "EGL_EXT_device_query")) {
+ EGLDeviceEXT device;
+ void *d3d11_device;
+
+ if (!eglQueryDisplayAttribEXT(qemu_egl_display,
+ EGL_DEVICE_EXT,
+ (EGLAttrib *)&device)) {
+ return 0;
+ }
+
+ if (!eglQueryDeviceAttribEXT(device,
+ EGL_D3D11_DEVICE_ANGLE,
+ (EGLAttrib *)&d3d11_device)) {
+ return 0;
+ }
+
+ trace_egl_init_d3d11_device(device);
+ qemu_egl_angle_d3d = device != NULL;
+ }
+#endif
+
+ return 0;
}
#endif
diff --git a/ui/trace-events b/ui/trace-events
index fe58675163..76b19a2995 100644
--- a/ui/trace-events
+++ b/ui/trace-events
@@ -162,3 +162,6 @@ dbus_clipboard_register(const char *bus_name) "peer %s"
dbus_clipboard_unregister(const char *bus_name) "peer %s"
dbus_scanout_texture(uint32_t tex_id, bool backing_y_0_top, uint32_t
backing_width, uint32_t backing_height, uint32_t x, uint32_t y, uint32_t w,
uint32_t h) "tex_id:%u y0top:%d back:%ux%u %u+%u-%ux%u"
dbus_gl_gfx_switch(void *p) "surf: %p"
+
+# egl-helpers.c
+egl_init_d3d11_device(void *p) "d3d device: %p"
--
2.41.0
- [PULL 10/33] ui/gtk: set the area of the scanout texture correctly, (continued)
- [PULL 10/33] ui/gtk: set the area of the scanout texture correctly, marcandre . lureau, 2023/06/27
- [PULL 17/33] ui/dbus: win32 support, marcandre . lureau, 2023/06/27
- [PULL 20/33] ui/dbus: introduce "Interfaces" properties, marcandre . lureau, 2023/06/27
- [PULL 26/33] ui: add egl_fb_read_rect(), marcandre . lureau, 2023/06/27
- [PULL 28/33] ui/dbus: add some GL traces, marcandre . lureau, 2023/06/27
- [PULL 21/33] console/win32: allocate shareable display surface, marcandre . lureau, 2023/06/27
- [PULL 25/33] ui/egl: default to GLES on windows, marcandre . lureau, 2023/06/27
- [PULL 29/33] virtio-gpu-virgl: teach it to get the QEMU EGL display, marcandre . lureau, 2023/06/27
- [PULL 27/33] ui/dbus: add GL support on win32, marcandre . lureau, 2023/06/27
- [PULL 30/33] ui/egl: query ANGLE d3d device,
marcandre . lureau <=
- [PULL 32/33] virtio-gpu-virgl: use D3D11_SHARE_TEXTURE when available, marcandre . lureau, 2023/06/27
- [PULL 33/33] ui/dbus: use shared D3D11 Texture2D when possible, marcandre . lureau, 2023/06/27
- [PULL 31/33] ui: add optional d3d texture pointer to scanout texture, marcandre . lureau, 2023/06/27