From 58ff764d4111bfaa7360c57bc62dd620fbdce06f Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 1 Feb 2012 08:27:16 +0100 Subject: xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012 --- mesalib/src/mesa/drivers/dri/common/Makefile.am | 2 ++ mesalib/src/mesa/drivers/dri/common/drirc | 7 +++++++ mesalib/src/mesa/drivers/dri/common/xmlpool/options.h | 10 ++++++++++ 3 files changed, 19 insertions(+) create mode 100644 mesalib/src/mesa/drivers/dri/common/drirc (limited to 'mesalib/src/mesa/drivers') 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 @@ + + + + + + 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 -- cgit v1.2.3