From abd066863e86baac304d4f0cc2fd221fd7cc0187 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 12 Apr 2013 10:37:20 -0500 Subject: Revert "mesa-demos: fix build errors" This reverts commit fd58fb07cf4fcc0553d0608f5688fc03e41ea15c. This was moved to oe-core, commit 60fabb6ea. --- .../mesa-demos/egl-mesa-screen-surface-query.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch (limited to 'common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch') 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 deleted file mode 100644 index 79537081..00000000 --- a/common/recipes-graphics/mesa/mesa-demos/egl-mesa-screen-surface-query.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cf90a5c0c173d017a80cde057da57c365b3b1a40 Mon Sep 17 00:00:00 2001 -From: Frank Binns -Date: Fri, 29 Jun 2012 12:00:26 +0100 -Subject: [PATCH 2/2] mesa-demos: Query display for EGL_MESA_screen_surface - extension before using it - -This code makes heavy use of the EGL_MESA_screen_surface extension so -check the display to determine if it's supported by the underlying EGL -implementation. If it doesn't then bail. - -Signed-off-by: Frank Binns - -Applied and fixed up in Yocto by... - -Integrated-by: Tom Zanussi - -Upstream-Status: Pending - -Index: mesa-demos-8.0.1/src/egl/opengl/demo1.c -=================================================================== ---- mesa-demos-8.0.1.orig/src/egl/opengl/demo1.c -+++ mesa-demos-8.0.1/src/egl/opengl/demo1.c -@@ -110,6 +110,12 @@ main(int argc, char *argv[]) - printf("EGL version = %d.%d\n", maj, min); - printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); - -+ if (!strstr(eglQueryString(d, EGL_EXTENSIONS), -+ "EGL_MESA_screen_surface")) { -+ printf("EGL_MESA_screen_surface is not supported\n"); -+ exit(1); -+ } -+ - eglGetConfigs(d, NULL, 0, &numConfigs); - configs = malloc(sizeof(*configs) *numConfigs); - eglGetConfigs(d, configs, numConfigs, &numConfigs); -- cgit v1.2.3-54-g00ecf