Brad Bishop | 6dbb316 | 2019-11-25 09:41:34 -0500 | [diff] [blame^] | 1 | From 5ad6515238bc042cccf9959abad44fdee9aeb07f Mon Sep 17 00:00:00 2001 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> |
| 3 | Date: Wed, 12 Jun 2019 14:18:31 -0300 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 4 | Subject: [PATCH] Allow enable DRI without DRI drivers |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
| 9 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame] | 10 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
Brad Bishop | 6dbb316 | 2019-11-25 09:41:34 -0500 | [diff] [blame^] | 11 | |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 12 | --- |
| 13 | meson.build | 2 +- |
| 14 | meson_options.txt | 6 ++++++ |
| 15 | 2 files changed, 7 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/meson.build b/meson.build |
Brad Bishop | 6dbb316 | 2019-11-25 09:41:34 -0500 | [diff] [blame^] | 18 | index 1e31eb4..512eec6 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 19 | --- a/meson.build |
| 20 | +++ b/meson.build |
Brad Bishop | 6dbb316 | 2019-11-25 09:41:34 -0500 | [diff] [blame^] | 21 | @@ -147,7 +147,7 @@ with_dri_r200 = dri_drivers.contains('r200') |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 22 | with_dri_nouveau = dri_drivers.contains('nouveau') |
| 23 | with_dri_swrast = dri_drivers.contains('swrast') |
| 24 | |
| 25 | -with_dri = dri_drivers.length() != 0 and dri_drivers != [''] |
Brad Bishop | 64c979e | 2019-11-04 13:55:29 -0500 | [diff] [blame] | 26 | +with_dri = get_option('dri') or (dri_drivers.length() != 0 and dri_drivers != ['']) |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 27 | |
| 28 | gallium_drivers = get_option('gallium-drivers') |
| 29 | if gallium_drivers.contains('auto') |
| 30 | diff --git a/meson_options.txt b/meson_options.txt |
Brad Bishop | 6dbb316 | 2019-11-25 09:41:34 -0500 | [diff] [blame^] | 31 | index 76cef24..a8abd04 100644 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 32 | --- a/meson_options.txt |
| 33 | +++ b/meson_options.txt |
| 34 | @@ -34,6 +34,12 @@ option( |
| 35 | choices : ['auto', 'true', 'false'], |
| 36 | description : 'enable support for dri3' |
| 37 | ) |
| 38 | +option( |
| 39 | + 'dri', |
| 40 | + type : 'boolean', |
| 41 | + value : false, |
| 42 | + description : 'enable support for dri' |
| 43 | +) |
| 44 | option( |
| 45 | 'dri-drivers', |
| 46 | type : 'array', |