diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-01 08:36:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-01 08:36:02 +0100 |
| commit | 68320ff05946f092b6836754c6267b1dff2f4633 (patch) | |
| tree | 424d73f509dff521d4cc22a95369594b7ee56dad /mesalib/src/mesa/drivers | |
| parent | 71b5bea4d5ef75f50bd7bd7b93f47f8552c178e0 (diff) | |
| parent | 58ff764d4111bfaa7360c57bc62dd620fbdce06f (diff) | |
| download | vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.gz vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.bz2 vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/Makefile.am | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/drirc | 7 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/xmlpool/options.h | 10 |
3 files changed, 19 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/Makefile.am b/mesalib/src/mesa/drivers/dri/common/Makefile.am index 4b43f4409..27c3e3d42 100644 --- a/mesalib/src/mesa/drivers/dri/common/Makefile.am +++ b/mesalib/src/mesa/drivers/dri/common/Makefile.am @@ -35,3 +35,5 @@ libdricommon_la_SOURCES = \ utils.c \ dri_util.c \ xmlconfig.c + +sysconf_DATA = drirc diff --git a/mesalib/src/mesa/drivers/dri/common/drirc b/mesalib/src/mesa/drivers/dri/common/drirc new file mode 100644 index 000000000..7abc64648 --- /dev/null +++ b/mesalib/src/mesa/drivers/dri/common/drirc @@ -0,0 +1,7 @@ +<driconf> + <device screen="0" driver="i965"> + <application name="Sanctuary"> + <option name="force_glsl_extensions_warn" value="true" /> + </application> + </device> +</driconf> diff --git a/mesalib/src/mesa/drivers/dri/common/xmlpool/options.h b/mesalib/src/mesa/drivers/dri/common/xmlpool/options.h index 1e584ba08..75c887e5d 100644 --- a/mesalib/src/mesa/drivers/dri/common/xmlpool/options.h +++ b/mesalib/src/mesa/drivers/dri/common/xmlpool/options.h @@ -626,3 +626,13 @@ DRI_CONF_OPT_BEGIN(always_flush_cache,bool,def) \ DRI_CONF_DESC(fr,"Enable flushing GPU caches with each draw call") \ DRI_CONF_DESC(sv,"Enable flushing GPU caches with each draw call") \ DRI_CONF_OPT_END + +#define DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN(def) \ +DRI_CONF_OPT_BEGIN(force_glsl_extensions_warn,bool,def) \ + DRI_CONF_DESC(en,"Force GLSL extension default behavior to 'warn'") \ + DRI_CONF_DESC(de,"Force GLSL extension default behavior to 'warn'") \ + DRI_CONF_DESC(es,"Force GLSL extension default behavior to 'warn'") \ + DRI_CONF_DESC(nl,"Force GLSL extension default behavior to 'warn'") \ + DRI_CONF_DESC(fr,"Force GLSL extension default behavior to 'warn'") \ + DRI_CONF_DESC(sv,"Force GLSL extension default behavior to 'warn'") \ +DRI_CONF_OPT_END |