[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/14] opengl: build opengl helper code modular
From: |
Gerd Hoffmann |
Subject: |
[PULL 14/14] opengl: build opengl helper code modular |
Date: |
Thu, 22 Oct 2020 07:12:23 +0200 |
Removes opengl dependency from core qemu. The number of shared
libraries for qemu-system-x86_64 goes down from 66 to 60 on my system.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20201019075224.14803-15-kraxel@redhat.com
---
util/module.c | 7 +++++++
ui/meson.build | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/util/module.c b/util/module.c
index 21237dcc24df..fe3b82dd4d37 100644
--- a/util/module.c
+++ b/util/module.c
@@ -181,6 +181,13 @@ static const struct {
{ "hw-display-qxl", "ui-spice-core" },
{ "ui-spice-app", "ui-spice-core" },
{ "ui-spice-app", "chardev-spice" },
+
+#ifdef CONFIG_OPENGL
+ { "ui-egl-headless", "ui-opengl" },
+ { "ui-gtk", "ui-opengl" },
+ { "ui-sdl", "ui-opengl" },
+ { "ui-spice-core", "ui-opengl" },
+#endif
};
#endif
diff --git a/ui/meson.build b/ui/meson.build
index 537e5e067358..5d4906c023b9 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -33,7 +33,6 @@ vnc_ss.add(zlib, png, jpeg)
vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
softmmu_ss.add_all(when: vnc, if_true: vnc_ss)
softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
-softmmu_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('shader.c',
'console-gl.c', 'egl-helpers.c', 'egl-context.c'))
specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl)
ui_modules = {}
@@ -44,6 +43,13 @@ if curses.found()
ui_modules += {'curses' : curses_ss}
endif
+if config_host.has_key('CONFIG_OPENGL')
+ opengl_ss = ss.source_set()
+ opengl_ss.add(when: [opengl, pixman, 'CONFIG_OPENGL'],
+ if_true: files('shader.c', 'console-gl.c', 'egl-helpers.c',
'egl-context.c'))
+ ui_modules += {'opengl' : opengl_ss}
+endif
+
if config_host.has_key('CONFIG_OPENGL_DMABUF')
egl_headless_ss = ss.source_set()
egl_headless_ss.add(when: [opengl, pixman, 'CONFIG_OPENGL_DMABUF'],
--
2.27.0
- [PULL 00/14] Modules 20201022 patches, Gerd Hoffmann, 2020/10/22
- [PULL 04/14] spice: move display_init() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 01/14] spice: add module helpers, Gerd Hoffmann, 2020/10/22
- [PULL 13/14] opengl: build egl-headless display modular, Gerd Hoffmann, 2020/10/22
- [PULL 02/14] spice: add QemuSpiceOps, move migrate_info, Gerd Hoffmann, 2020/10/22
- [PULL 03/14] spice: move qemu_spice_init() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 08/14] spice: wire up monitor in QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 09/14] spice: load module when enabled on the cmdline, Gerd Hoffmann, 2020/10/22
- [PULL 12/14] spice: flip modules switch, Gerd Hoffmann, 2020/10/22
- [PULL 14/14] opengl: build opengl helper code modular,
Gerd Hoffmann <=
- [PULL 10/14] modules: dependencies infrastructure, Gerd Hoffmann, 2020/10/22
- [PULL 11/14] modules: add spice dependencies, Gerd Hoffmann, 2020/10/22
- [PULL 07/14] spice: move display_add_client() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 05/14] spice: move add_interface() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 06/14] spice: move auth functions to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- Re: [PULL 00/14] Modules 20201022 patches, Peter Maydell, 2020/10/22