diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-04-06 16:47:32 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-04-08 11:39:12 -0500 |
commit | fd58fb07cf4fcc0553d0608f5688fc03e41ea15c (patch) | |
tree | aed53afd6c9c5d1e645a4edb31c0b7b0bfd17ea1 /common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch | |
parent | 8c0bb1be455411ab2d4001a5b3f79c80b19dffc8 (diff) | |
download | meta-intel-062ecea2b66ab3225af5ffb2f5f99fa32e7d8fb0.tar.gz |
mesa-demos: fix build errors1.4_M6.rc1
When commit 6d17c9b ('emgd-driver-bin: add pkgconfig files') was added
for libva, it exposed some missing EMGD functionality, which it turns
out has been fixed by patches submitted or accepted upstream (see the
individual patches for details).
This adds those patches to get around the build problems when building
with EMGD 1.16.
Fixes [YOCTO #3469] for meta-intel (EMGD).
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch')
-rw-r--r-- | common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch b/common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch new file mode 100644 index 00000000..79537081 --- /dev/null +++ b/common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From cf90a5c0c173d017a80cde057da57c365b3b1a40 Mon Sep 17 00:00:00 2001 | ||
2 | From: Frank Binns <frank.binns@imgtec.com> | ||
3 | Date: Fri, 29 Jun 2012 12:00:26 +0100 | ||
4 | Subject: [PATCH 2/2] mesa-demos: Query display for EGL_MESA_screen_surface | ||
5 | extension before using it | ||
6 | |||
7 | This code makes heavy use of the EGL_MESA_screen_surface extension so | ||
8 | check the display to determine if it's supported by the underlying EGL | ||
9 | implementation. If it doesn't then bail. | ||
10 | |||
11 | Signed-off-by: Frank Binns <frank.binns@imgtec.com> | ||
12 | |||
13 | Applied and fixed up in Yocto by... | ||
14 | |||
15 | Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Index: mesa-demos-8.0.1/src/egl/opengl/demo1.c | ||
20 | =================================================================== | ||
21 | --- mesa-demos-8.0.1.orig/src/egl/opengl/demo1.c | ||
22 | +++ mesa-demos-8.0.1/src/egl/opengl/demo1.c | ||
23 | @@ -110,6 +110,12 @@ main(int argc, char *argv[]) | ||
24 | printf("EGL version = %d.%d\n", maj, min); | ||
25 | printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); | ||
26 | |||
27 | + if (!strstr(eglQueryString(d, EGL_EXTENSIONS), | ||
28 | + "EGL_MESA_screen_surface")) { | ||
29 | + printf("EGL_MESA_screen_surface is not supported\n"); | ||
30 | + exit(1); | ||
31 | + } | ||
32 | + | ||
33 | eglGetConfigs(d, NULL, 0, &numConfigs); | ||
34 | configs = malloc(sizeof(*configs) *numConfigs); | ||
35 | eglGetConfigs(d, configs, numConfigs, &numConfigs); | ||