mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
piglit: Update to current git master
Update, remove backported patches. (From OE-Core rev: 6733936c432a4e73c8dc63099c6abf7e393a1f93) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen
committed by
Richard Purdie
Richard Purdie
parent
854c8c2e4c
commit
715b05e9e1
-49
@@ -1,49 +0,0 @@
|
||||
From 6b6acee8841d092e5066b1bec2ba1c49cce4f91f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
|
||||
Date: Thu, 4 May 2017 00:57:39 -0500
|
||||
Subject: [PATCH 1/4] CMake: define GBM_BO_MAP only when symbol is found
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
gbm_bo_map() and _unmap() have been added recently to Mesa,
|
||||
and this update may not have reached all implementations of
|
||||
GBM, such as the one provided by Mali r6, where said
|
||||
definitions can be found in the header file but not in the
|
||||
library itself. This leads to errors like the following when
|
||||
linking:
|
||||
../../../../lib/libpiglitutil_gl.so.0: undefined reference to `gbm_bo_unmap'
|
||||
../../../../lib/libpiglitutil_gl.so.0: undefined reference to `gbm_bo_map'
|
||||
collect2: error: ld returned 1 exit status
|
||||
make[2]: *** [bin/point-sprite] Error 1
|
||||
|
||||
Instead of relying on the header file, actually try to link
|
||||
using that symbol to determine if PIGLIT_HAS_GBM_BO_MAP
|
||||
should be defined.
|
||||
|
||||
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
|
||||
Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
|
||||
Upstream-Status: Backport
|
||||
---
|
||||
CMakeLists.txt | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a4ff99e..cc26fa8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -141,8 +141,9 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
if(GBM_FOUND)
|
||||
set(PIGLIT_HAS_GBM True)
|
||||
add_definitions(-DPIGLIT_HAS_GBM)
|
||||
- if (GBM_VERSION VERSION_EQUAL "12.1" OR GBM_VERSION VERSION_GREATER "12.1")
|
||||
- set(PIGLIT_HAS_GBM_BO_MAP True)
|
||||
+ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GBM_LIBRARIES})
|
||||
+ CHECK_FUNCTION_EXISTS(gbm_bo_map PIGLIT_HAS_GBM_BO_MAP)
|
||||
+ if (PIGLIT_HAS_GBM_BO_MAP)
|
||||
add_definitions(-DPIGLIT_HAS_GBM_BO_MAP)
|
||||
endif()
|
||||
endif(GBM_FOUND)
|
||||
--
|
||||
1.9.1
|
||||
|
||||
-49
@@ -1,49 +0,0 @@
|
||||
From aa6728cc4941a87e3933c2aa770ab8ae3080b870 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
|
||||
Date: Tue, 16 May 2017 12:37:07 -0500
|
||||
Subject: [PATCH 2/4] util/egl: Honour Surfaceless MESA in get_default_display
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
tests/util/piglit-util-egl.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/tests/util/piglit-util-egl.c b/tests/util/piglit-util-egl.c
|
||||
index 106c735..389fe12 100644
|
||||
--- a/tests/util/piglit-util-egl.c
|
||||
+++ b/tests/util/piglit-util-egl.c
|
||||
@@ -85,6 +85,7 @@ piglit_egl_get_default_display(EGLenum platform)
|
||||
static bool has_x11 = false;
|
||||
static bool has_wayland = false;
|
||||
static bool has_gbm = false;
|
||||
+ static bool has_surfaceless_mesa = false;
|
||||
|
||||
static EGLDisplay (*peglGetPlatformDisplayEXT)(EGLenum platform, void *native_display, const EGLint *attrib_list);
|
||||
|
||||
@@ -99,6 +100,7 @@ piglit_egl_get_default_display(EGLenum platform)
|
||||
has_x11 = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_x11");
|
||||
has_wayland = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_wayland");
|
||||
has_gbm = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_EXT_platform_gbm");
|
||||
+ has_surfaceless_mesa = piglit_is_egl_extension_supported(EGL_NO_DISPLAY, "EGL_MESA_platform_surfaceless");
|
||||
|
||||
peglGetPlatformDisplayEXT = (void*) eglGetProcAddress("eglGetPlatformDisplayEXT");
|
||||
}
|
||||
@@ -123,6 +125,11 @@ piglit_egl_get_default_display(EGLenum platform)
|
||||
return EGL_NO_DISPLAY;
|
||||
}
|
||||
break;
|
||||
+ case EGL_PLATFORM_SURFACELESS_MESA:
|
||||
+ if (!has_surfaceless_mesa) {
|
||||
+ return EGL_NO_DISPLAY;
|
||||
+ }
|
||||
+ break;
|
||||
default:
|
||||
fprintf(stderr, "%s: unrecognized platform %#x\n", __func__, platform);
|
||||
return EGL_NO_DISPLAY;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
-31
@@ -1,31 +0,0 @@
|
||||
From b02bdbfdba3464ce47f87c04bcd1d35a8fef3f54 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
|
||||
Date: Wed, 17 May 2017 17:53:10 -0500
|
||||
Subject: [PATCH 3/4] egl_mesa_platform_surfaceless: Don't use
|
||||
eglGetPlatformDisplay directly
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
.../spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c
|
||||
index 3bbd6aa..81a3919 100644
|
||||
--- a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c
|
||||
+++ b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c
|
||||
@@ -31,7 +31,7 @@ test_setup(EGLDisplay *dpy)
|
||||
|
||||
piglit_require_egl_extension(EGL_NO_DISPLAY, "EGL_MESA_platform_surfaceless");
|
||||
|
||||
- *dpy = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA, NULL, NULL);
|
||||
+ *dpy = piglit_egl_get_default_display(EGL_PLATFORM_SURFACELESS_MESA);
|
||||
if (*dpy == EGL_NO_DISPLAY) {
|
||||
printf("failed to get EGLDisplay\n");
|
||||
piglit_report_result(PIGLIT_SKIP);
|
||||
--
|
||||
1.9.1
|
||||
|
||||
-76
@@ -1,76 +0,0 @@
|
||||
From f3bb10947a87cc3a59619847f53d47708e10fbb7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
|
||||
Date: Wed, 17 May 2017 10:51:48 -0500
|
||||
Subject: [PATCH 4/4] egl_mesa_platform_surfaceless: Use EXT functions for
|
||||
surfaces
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
These EXT symbols are guaranteed to exist since they require
|
||||
EGL_EXT_platform_base.
|
||||
|
||||
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
.../egl_mesa_platform_surfaceless.c | 23 ++++++++++++++++++++--
|
||||
1 file changed, 21 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c
|
||||
index 81a3919..264ed71 100644
|
||||
--- a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c
|
||||
+++ b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c
|
||||
@@ -24,6 +24,24 @@
|
||||
#include "piglit-util.h"
|
||||
#include "piglit-util-egl.h"
|
||||
|
||||
+/* Extension function pointers.
|
||||
+ *
|
||||
+ * Use prefix 'pegl' (piglit egl) instead of 'egl' to avoid collisions with
|
||||
+ * prototypes in eglext.h. */
|
||||
+EGLSurface (*peglCreatePlatformPixmapSurfaceEXT)(EGLDisplay display, EGLConfig config,
|
||||
+ NativePixmapType native_pixmap, const EGLint *attrib_list);
|
||||
+EGLSurface (*peglCreatePlatformWindowSurfaceEXT)(EGLDisplay display, EGLConfig config,
|
||||
+ NativeWindowType native_window, const EGLint *attrib_list);
|
||||
+
|
||||
+static void
|
||||
+init_egl_extension_funcs(void)
|
||||
+{
|
||||
+ peglCreatePlatformPixmapSurfaceEXT = (void*)
|
||||
+ eglGetProcAddress("eglCreatePlatformPixmapSurfaceEXT");
|
||||
+ peglCreatePlatformWindowSurfaceEXT = (void*)
|
||||
+ eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT");
|
||||
+}
|
||||
+
|
||||
static void
|
||||
test_setup(EGLDisplay *dpy)
|
||||
{
|
||||
@@ -72,7 +90,7 @@ test_create_window(void *test_data)
|
||||
|
||||
test_setup(&dpy);
|
||||
|
||||
- surf = eglCreatePlatformWindowSurface(dpy, EGL_NO_CONFIG_KHR,
|
||||
+ surf = peglCreatePlatformWindowSurfaceEXT(dpy, EGL_NO_CONFIG_KHR,
|
||||
/*native_window*/ NULL,
|
||||
/*attrib_list*/ NULL);
|
||||
if (surf) {
|
||||
@@ -103,7 +121,7 @@ test_create_pixmap(void *test_data)
|
||||
|
||||
test_setup(&dpy);
|
||||
|
||||
- surf = eglCreatePlatformPixmapSurface(dpy, EGL_NO_CONFIG_KHR,
|
||||
+ surf = peglCreatePlatformPixmapSurfaceEXT(dpy, EGL_NO_CONFIG_KHR,
|
||||
/*native_window*/ NULL,
|
||||
/*attrib_list*/ NULL);
|
||||
if (surf) {
|
||||
@@ -205,6 +223,7 @@ main(int argc, char **argv)
|
||||
piglit_report_result(PIGLIT_FAIL);
|
||||
}
|
||||
|
||||
+ init_egl_extension_funcs();
|
||||
result = piglit_run_selected_subtests(subtests, selected_names,
|
||||
num_selected, result);
|
||||
piglit_report_result(result);
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
|
||||
SRC_URI = "git://anongit.freedesktop.org/piglit \
|
||||
file://0001-cmake-install-bash-completions-in-the-right-place.patch \
|
||||
file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
|
||||
file://0001-CMake-define-GBM_BO_MAP-only-when-symbol-is-found.patch \
|
||||
file://0002-util-egl-Honour-Surfaceless-MESA-in-get_default_disp.patch \
|
||||
file://0003-egl_mesa_platform_surfaceless-Don-t-use-eglGetPlatfo.patch \
|
||||
file://0004-egl_mesa_platform_surfaceless-Use-EXT-functions-for-.patch \
|
||||
"
|
||||
|
||||
# From 2017-02-06
|
||||
SRCREV = "ca58eec0b965655c7eba592a634cbf4aadfbc675"
|
||||
# From 2017-07-03
|
||||
SRCREV = "c8f4fd9eeb298a2ef0855927f22634f794ef3eff"
|
||||
# (when PV goes above 1.0 remove the trailing r)
|
||||
PV = "1.0+gitr${SRCPV}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user