Module: Mesa Branch: master Commit: 1b62a4e885267c374dbbe5d5bb2c36515eee6a95 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b62a4e885267c374dbbe5d5bb2c36515eee6a95
Author: Eric Anholt <[email protected]> Date: Sat Nov 21 12:52:48 2015 -0800 vc4: Take precedence over ilo when in simulator mode. They're exclusive at build time, but the ilo entry is always present, so we'd try to use it and fail out. v2: Add comment in the code, from Emil. Cc: [email protected] Reviewed-by: Emil Velikov <[email protected]> --- .../auxiliary/pipe-loader/pipe_loader_drm.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index b5dfc56..994a284 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -94,6 +94,18 @@ static const struct drm_driver_descriptor driver_descriptors[] = { .create_screen = pipe_i915_create_screen, .configuration = configuration_query, }, +#ifdef USE_VC4_SIMULATOR + /* VC4 simulator and ILO (i965) are mutually exclusive (error at + * configure). As the latter is unconditionally added, keep this one above + * it. + */ + { + .name = "i965", + .driver_name = "vc4", + .create_screen = pipe_vc4_create_screen, + .configuration = configuration_query, + }, +#endif { .name = "i965", .driver_name = "i915", @@ -154,14 +166,6 @@ static const struct drm_driver_descriptor driver_descriptors[] = { .create_screen = pipe_vc4_create_screen, .configuration = configuration_query, }, -#ifdef USE_VC4_SIMULATOR - { - .name = "i965", - .driver_name = "vc4", - .create_screen = pipe_vc4_create_screen, - .configuration = configuration_query, - }, -#endif }; #endif _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
