Remove, no longer needed
Sebastian Ramacher
4 years ago
| 0 | From: Haihao Xiang <haihao.xiang@intel.com> | |
| 1 | Date: Fri, 7 Dec 2018 13:31:43 +0800 | |
| 2 | Subject: Check the interface from libva first | |
| 3 | ||
| 4 | And bump libva dependency to 1.4.0 | |
| 5 | ||
| 6 | This fixes https://github.com/intel/intel-vaapi-driver/issues/419 | |
| 7 | ||
| 8 | Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> | |
| 9 | --- | |
| 10 | configure.ac | 2 +- | |
| 11 | src/i965_output_wayland.c | 27 ++++++++++++++++----------- | |
| 12 | 2 files changed, 17 insertions(+), 12 deletions(-) | |
| 13 | ||
| 14 | diff --git a/configure.ac b/configure.ac | |
| 15 | index 1604105..7893cb8 100644 | |
| 16 | --- a/configure.ac | |
| 17 | +++ b/configure.ac | |
| 18 | @@ -10,7 +10,7 @@ m4_append([intel_vaapi_driver_version], intel_vaapi_driver_pre_version, [.pre]) | |
| 19 | ]) | |
| 20 | ||
| 21 | # libva minimum version requirement | |
| 22 | -m4_define([va_api_version], [1.1.0]) | |
| 23 | +m4_define([va_api_version], [1.4.0]) | |
| 24 | ||
| 25 | # libdrm minimum version requirement | |
| 26 | m4_define([libdrm_version], [2.4.52]) | |
| 27 | diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c | |
| 28 | index 122db95..a637552 100644 | |
| 29 | --- a/src/i965_output_wayland.c | |
| 30 | +++ b/src/i965_output_wayland.c | |
| 31 | @@ -397,6 +397,7 @@ i965_output_wayland_init(VADriverContextP ctx) | |
| 32 | struct i965_driver_data * const i965 = i965_driver_data(ctx); | |
| 33 | struct dso_handle *dso_handle; | |
| 34 | struct wl_vtable *wl_vtable; | |
| 35 | + struct VADriverVTableWayland * const vtable = ctx->vtable_wayland; | |
| 36 | ||
| 37 | static const struct dso_symbol libegl_symbols[] = { | |
| 38 | { | |
| 39 | @@ -465,25 +466,29 @@ i965_output_wayland_init(VADriverContextP ctx) | |
| 40 | if (!i965->wl_output) | |
| 41 | goto error; | |
| 42 | ||
| 43 | - i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); | |
| 44 | - if (!i965->wl_output->libegl_handle) { | |
| 45 | - i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); | |
| 46 | - if (!i965->wl_output->libegl_handle) | |
| 47 | + wl_vtable = &i965->wl_output->vtable; | |
| 48 | + | |
| 49 | + if (vtable->wl_interface) | |
| 50 | + wl_vtable->drm_interface = vtable->wl_interface; | |
| 51 | + else { | |
| 52 | + i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME); | |
| 53 | + if (!i965->wl_output->libegl_handle) { | |
| 54 | + i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK); | |
| 55 | + if (!i965->wl_output->libegl_handle) | |
| 56 | + goto error; | |
| 57 | + } | |
| 58 | + | |
| 59 | + dso_handle = i965->wl_output->libegl_handle; | |
| 60 | + if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), | |
| 61 | + libegl_symbols)) | |
| 62 | goto error; | |
| 63 | } | |
| 64 | ||
| 65 | - dso_handle = i965->wl_output->libegl_handle; | |
| 66 | - wl_vtable = &i965->wl_output->vtable; | |
| 67 | - if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), | |
| 68 | - libegl_symbols)) | |
| 69 | - goto error; | |
| 70 | - | |
| 71 | i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME); | |
| 72 | if (!i965->wl_output->libwl_client_handle) | |
| 73 | goto error; | |
| 74 | ||
| 75 | dso_handle = i965->wl_output->libwl_client_handle; | |
| 76 | - wl_vtable = &i965->wl_output->vtable; | |
| 77 | if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable), | |
| 78 | libwl_client_symbols)) | |
| 79 | goto error; |