diff options
Diffstat (limited to 'recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch')
-rw-r--r-- | recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch deleted file mode 100644 index 58f82663..00000000 --- a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Levonmaa <mikko.levonmaa@palm.com> | ||
3 | Date: Wed, 6 Mar 2013 10:18:49 -0800 | ||
4 | Subject: [PATCH 3/3] eglCreateImageKHR requires the context to be NULL | ||
5 | |||
6 | As per the EGL spec the context passed to that function should | ||
7 | be null. | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | .../wayland-egl/waylandeglintegration.cpp | 16 ++-------------- | ||
12 | 1 file changed, 2 insertions(+), 14 deletions(-) | ||
13 | |||
14 | diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp | ||
15 | index 73877c4..16e77fb 100644 | ||
16 | --- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp | ||
17 | +++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp | ||
18 | @@ -101,7 +101,6 @@ public: | ||
19 | |||
20 | PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d; | ||
21 | |||
22 | - QPlatformNativeInterface::NativeResourceForContextFunction get_egl_context; | ||
23 | }; | ||
24 | |||
25 | WaylandEglIntegration::WaylandEglIntegration() | ||
26 | @@ -121,10 +120,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla | ||
27 | const char *extensionString = eglQueryString(d->egl_display, EGL_EXTENSIONS); | ||
28 | if (extensionString && strstr(extensionString, "EGL_WL_bind_wayland_display")) | ||
29 | { | ||
30 | - d->get_egl_context = nativeInterface->nativeResourceFunctionForContext("get_egl_context"); | ||
31 | - if (!d->get_egl_context) { | ||
32 | - qWarning("Failed to retrieve the get_egl_context function"); | ||
33 | - } | ||
34 | d->egl_bind_wayland_display = | ||
35 | reinterpret_cast<PFNEGLBINDWAYLANDDISPLAYWL>(eglGetProcAddress("eglBindWaylandDisplayWL")); | ||
36 | d->egl_unbind_wayland_display = | ||
37 | @@ -137,7 +132,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla | ||
38 | reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES")); | ||
39 | |||
40 | if (d->egl_bind_wayland_display | ||
41 | - && d->get_egl_context | ||
42 | && d->egl_unbind_wayland_display | ||
43 | && d->egl_create_image | ||
44 | && d->egl_destroy_image | ||
45 | @@ -162,10 +156,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGL | ||
46 | return 0; | ||
47 | } | ||
48 | |||
49 | - QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); | ||
50 | - EGLContext egl_context = d->get_egl_context(context); | ||
51 | - | ||
52 | - EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, | ||
53 | + EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, | ||
54 | EGL_WAYLAND_BUFFER_WL, | ||
55 | buffer, NULL); | ||
56 | |||
57 | @@ -229,10 +220,7 @@ void *WaylandEglIntegration::lockNativeBuffer(struct wl_buffer *buffer, QOpenGLC | ||
58 | { | ||
59 | Q_D(const WaylandEglIntegration); | ||
60 | |||
61 | - QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); | ||
62 | - EGLContext egl_context = d->get_egl_context(context); | ||
63 | - | ||
64 | - EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context, | ||
65 | + EGLImageKHR image = d->egl_create_image(d->egl_display, NULL, | ||
66 | EGL_WAYLAND_BUFFER_WL, | ||
67 | buffer, NULL); | ||
68 | return image; | ||
69 | -- | ||
70 | 1.8.2.1 | ||
71 | |||