diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-03-19 09:42:46 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-03-19 09:42:46 +0000 |
| commit | ccc4429c56407d748a745a4abc13d76717a2ed59 (patch) | |
| tree | 0617f08c2c5dab77c3645d6fd676b47b8098065b | |
| parent | b1ebf474d34dad6d1a2e3d2593af41e9a5505746 (diff) | |
Import Mesa 18.3.5
| -rw-r--r-- | lib/mesa/src/util/00-mesa-defaults.conf | 9 | ||||
| -rw-r--r-- | lib/mesa/src/util/xmlpool/options.h | 11 | ||||
| -rw-r--r-- | lib/mesa/src/util/xmlpool/t_options.h | 5 |
3 files changed, 25 insertions, 0 deletions
diff --git a/lib/mesa/src/util/00-mesa-defaults.conf b/lib/mesa/src/util/00-mesa-defaults.conf index a937c46d0..830927a26 100644 --- a/lib/mesa/src/util/00-mesa-defaults.conf +++ b/lib/mesa/src/util/00-mesa-defaults.conf @@ -227,6 +227,9 @@ TODO: document the other workarounds. <application name="Civilization 6" executable="Civ6"> <option name="mesa_glthread" value="true"/> </application> + <application name="Civilization 6" executable="Civ6Sub"> + <option name="mesa_glthread" value="true"/> + </application> <application name="Dreamfall Chapters" executable="Dreamfall Chapters"> <option name="mesa_glthread" value="true"/> @@ -334,5 +337,11 @@ TODO: document the other workarounds. <application name="No Mans Sky" executable="NMS.exe"> <option name="radeonsi_zerovram" value="true" /> </application> + <application name="Civilization 6" executable="Civ6"> + <option name="radeonsi_enable_nir" value="true"/> + </application> + <application name="Civilization 6" executable="Civ6Sub"> + <option name="radeonsi_enable_nir" value="true"/> + </application> </device> </driconf> diff --git a/lib/mesa/src/util/xmlpool/options.h b/lib/mesa/src/util/xmlpool/options.h index 0c3fa9e4a..0f5e93da8 100644 --- a/lib/mesa/src/util/xmlpool/options.h +++ b/lib/mesa/src/util/xmlpool/options.h @@ -680,3 +680,14 @@ DRI_CONF_OPT_END DRI_CONF_OPT_BEGIN_B(radeonsi_zerovram, def) \ DRI_CONF_DESC(en,"Zero all vram allocations") \ DRI_CONF_OPT_END + +#define DRI_CONF_RADEONSI_ENABLE_NIR(def) \ +DRI_CONF_OPT_BEGIN_B(radeonsi_enable_nir, def) \ + DRI_CONF_DESC(en,"Enable NIR") \ + DRI_CONF_DESC(ca,"Enable NIR") \ + DRI_CONF_DESC(de,"Enable NIR") \ + DRI_CONF_DESC(es,"Enable NIR") \ + DRI_CONF_DESC(nl,"Enable NIR") \ + DRI_CONF_DESC(fr,"Enable NIR") \ + DRI_CONF_DESC(sv,"Enable NIR") \ +DRI_CONF_OPT_END diff --git a/lib/mesa/src/util/xmlpool/t_options.h b/lib/mesa/src/util/xmlpool/t_options.h index e0a30f5fd..2fa7c428a 100644 --- a/lib/mesa/src/util/xmlpool/t_options.h +++ b/lib/mesa/src/util/xmlpool/t_options.h @@ -342,3 +342,8 @@ DRI_CONF_OPT_END DRI_CONF_OPT_BEGIN_B(radeonsi_zerovram, def) \ DRI_CONF_DESC(en,"Zero all vram allocations") \ DRI_CONF_OPT_END + +#define DRI_CONF_RADEONSI_ENABLE_NIR(def) \ +DRI_CONF_OPT_BEGIN_B(radeonsi_enable_nir, def) \ + DRI_CONF_DESC(en,gettext("Enable NIR")) \ +DRI_CONF_OPT_END |