| 1 |
$OpenBSD: patch-src_backends_meta-egl_c,v 1.2 2018/04/26 09:19:27 jasper Exp $ |
| 2 |
|
| 3 |
Revert non-portable portion of: |
| 4 |
From b7b5fb293d1de3af9e533f2063749fde7a790945 Mon Sep 17 00:00:00 2001 |
| 5 |
From: Daniel Stone <daniels@collabora.com> |
| 6 |
Date: Tue, 11 Jul 2017 16:03:26 +0100 |
| 7 |
Subject: [PATCH] wayland: Add zwp_linux_dmabuf_v1 support |
| 8 |
|
| 9 |
Index: src/backends/meta-egl.c |
| 10 |
--- src/backends/meta-egl.c.orig |
| 11 |
+++ src/backends/meta-egl.c |
| 12 |
@@ -67,8 +67,6 @@ struct _MetaEgl |
| 13 |
PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR; |
| 14 |
PFNEGLSTREAMCONSUMERACQUIREATTRIBNVPROC eglStreamConsumerAcquireAttribNV; |
| 15 |
|
| 16 |
- PFNEGLQUERYDMABUFFORMATSEXTPROC eglQueryDmaBufFormatsEXT; |
| 17 |
- PFNEGLQUERYDMABUFMODIFIERSEXTPROC eglQueryDmaBufModifiersEXT; |
| 18 |
}; |
| 19 |
|
| 20 |
G_DEFINE_TYPE (MetaEgl, meta_egl, G_TYPE_OBJECT) |
| 21 |
@@ -926,51 +924,6 @@ meta_egl_stream_consumer_acquire (MetaEgl *egl, |
| 22 |
return TRUE; |
| 23 |
} |
| 24 |
|
| 25 |
-gboolean |
| 26 |
-meta_egl_query_dma_buf_formats (MetaEgl *egl, |
| 27 |
- EGLDisplay display, |
| 28 |
- EGLint max_formats, |
| 29 |
- EGLint *formats, |
| 30 |
- EGLint *num_formats, |
| 31 |
- GError **error) |
| 32 |
-{ |
| 33 |
- if (!is_egl_proc_valid (egl->eglQueryDmaBufFormatsEXT, error)) |
| 34 |
- return FALSE; |
| 35 |
- |
| 36 |
- if (!egl->eglQueryDmaBufFormatsEXT (display, max_formats, formats, |
| 37 |
- num_formats)) |
| 38 |
- { |
| 39 |
- set_egl_error (error); |
| 40 |
- return FALSE; |
| 41 |
- } |
| 42 |
- |
| 43 |
- return TRUE; |
| 44 |
-} |
| 45 |
- |
| 46 |
-gboolean |
| 47 |
-meta_egl_query_dma_buf_modifiers (MetaEgl *egl, |
| 48 |
- EGLDisplay display, |
| 49 |
- EGLint format, |
| 50 |
- EGLint max_modifiers, |
| 51 |
- EGLuint64KHR *modifiers, |
| 52 |
- EGLBoolean *external_only, |
| 53 |
- EGLint *num_modifiers, |
| 54 |
- GError **error) |
| 55 |
-{ |
| 56 |
- if (!is_egl_proc_valid (egl->eglQueryDmaBufModifiersEXT, error)) |
| 57 |
- return FALSE; |
| 58 |
- |
| 59 |
- if (!egl->eglQueryDmaBufModifiersEXT (display, format, max_modifiers, |
| 60 |
- modifiers, external_only, |
| 61 |
- num_modifiers)) |
| 62 |
- { |
| 63 |
- set_egl_error (error); |
| 64 |
- return FALSE; |
| 65 |
- } |
| 66 |
- |
| 67 |
- return TRUE; |
| 68 |
-} |
| 69 |
- |
| 70 |
#define GET_EGL_PROC_ADDR(proc) \ |
| 71 |
egl->proc = (void *) eglGetProcAddress (#proc); |
| 72 |
|
| 73 |
@@ -1007,8 +960,6 @@ meta_egl_constructed (GObject *object) |
| 74 |
GET_EGL_PROC_ADDR (eglStreamConsumerAcquireKHR); |
| 75 |
GET_EGL_PROC_ADDR (eglStreamConsumerAcquireAttribNV); |
| 76 |
|
| 77 |
- GET_EGL_PROC_ADDR (eglQueryDmaBufFormatsEXT); |
| 78 |
- GET_EGL_PROC_ADDR (eglQueryDmaBufModifiersEXT); |
| 79 |
} |
| 80 |
|
| 81 |
#undef GET_EGL_PROC_ADDR |
