Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

hardware-intel-common-vaapi: Commit

hardware/intel/common/vaapi


Commit MetaInfo

Revisionf139dafa59172d40543f2ec469a035d3de9fdc6a (tree)
Time2019-01-11 15:44:33
AuthorHaihao Xiang <haihao.xiang@inte...>
CommiterXiang, Haihao

Log Message

Check the interface from libva first

And bump libva dependency to 1.4.0

This fixes https://github.com/intel/intel-vaapi-driver/issues/419

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>

Change Summary

Incremental Difference

--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ m4_append([intel_vaapi_driver_version], intel_vaapi_driver_pre_version, [.pre])
1010 ])
1111
1212 # libva minimum version requirement
13-m4_define([va_api_version], [1.1.0])
13+m4_define([va_api_version], [1.4.0])
1414
1515 # libdrm minimum version requirement
1616 m4_define([libdrm_version], [2.4.52])
--- a/src/i965_output_wayland.c
+++ b/src/i965_output_wayland.c
@@ -397,6 +397,7 @@ i965_output_wayland_init(VADriverContextP ctx)
397397 struct i965_driver_data * const i965 = i965_driver_data(ctx);
398398 struct dso_handle *dso_handle;
399399 struct wl_vtable *wl_vtable;
400+ struct VADriverVTableWayland * const vtable = ctx->vtable_wayland;
400401
401402 static const struct dso_symbol libegl_symbols[] = {
402403 {
@@ -465,25 +466,29 @@ i965_output_wayland_init(VADriverContextP ctx)
465466 if (!i965->wl_output)
466467 goto error;
467468
468- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
469- if (!i965->wl_output->libegl_handle) {
470- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
471- if (!i965->wl_output->libegl_handle)
469+ wl_vtable = &i965->wl_output->vtable;
470+
471+ if (vtable->wl_interface)
472+ wl_vtable->drm_interface = vtable->wl_interface;
473+ else {
474+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
475+ if (!i965->wl_output->libegl_handle) {
476+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
477+ if (!i965->wl_output->libegl_handle)
478+ goto error;
479+ }
480+
481+ dso_handle = i965->wl_output->libegl_handle;
482+ if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
483+ libegl_symbols))
472484 goto error;
473485 }
474486
475- dso_handle = i965->wl_output->libegl_handle;
476- wl_vtable = &i965->wl_output->vtable;
477- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
478- libegl_symbols))
479- goto error;
480-
481487 i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME);
482488 if (!i965->wl_output->libwl_client_handle)
483489 goto error;
484490
485491 dso_handle = i965->wl_output->libwl_client_handle;
486- wl_vtable = &i965->wl_output->vtable;
487492 if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
488493 libwl_client_symbols))
489494 goto error;
Show on old repository browser