summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCarlos Alberto Lopez Perez <clopez@igalia.com>2015-10-06 17:00:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-12 14:36:27 +0100
commit67959b9a15bc775158197926c3a0bcb557149777 (patch)
tree774dd4ef559bd5d74641644d1754f263503f0df1 /meta
parentfedff4f1af28b00040a3192e71bb24963235cfa1 (diff)
downloadpoky-67959b9a15bc775158197926c3a0bcb557149777.tar.gz
machine/qemu: Fix OpenGL/GLX support with xserver-xorg.
* The Xorg server needs to load the GLX extension in order to enable proper OpenGL support. * Before this patch, glxinfo aborted with: root@qemux86:~# glxinfo name of display: :0.0 Error: couldn't find RGB GLX visual or fbconfig * After this patch, it works as expected: root@qemux86:~# glxinfo | grep " render" direct rendering: Yes OpenGL renderer string: Software Rasterizer (From OE-Core rev: 8f33627684755899c5b1fd7eeefdd89c42e68fec) Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index d5c0b376ce..16e94691dc 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
5PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 5PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
6 6
7XSERVER ?= "xserver-xorg \ 7XSERVER ?= "xserver-xorg \
8 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 8 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
9 xf86-input-evdev \ 9 xf86-input-evdev \
10 xf86-input-mouse \ 10 xf86-input-mouse \
11 xf86-video-fbdev \ 11 xf86-video-fbdev \
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index a4fd43ce1a..489194aa6e 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -16,7 +16,7 @@ KERNEL_IMAGETYPE = "bzImage"
16SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" 16SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
17 17
18XSERVER = "xserver-xorg \ 18XSERVER = "xserver-xorg \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
20 xf86-input-vmmouse \ 20 xf86-input-vmmouse \
21 xf86-input-keyboard \ 21 xf86-input-keyboard \
22 xf86-input-evdev \ 22 xf86-input-evdev \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 96cea66b49..3cc8091581 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
15SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" 15SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1"
16 16
17XSERVER = "xserver-xorg \ 17XSERVER = "xserver-xorg \
18 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 18 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
19 xf86-input-vmmouse \ 19 xf86-input-vmmouse \
20 xf86-input-keyboard \ 20 xf86-input-keyboard \
21 xf86-input-evdev \ 21 xf86-input-evdev \