Mesa (master): driconf: Add option definitions to source file, not generated target

Carl Worth cworth at kemper.freedesktop.org
Fri Jan 11 22:31:40 UTC 2013


Module: Mesa
Branch: master
Commit: bc50f02bc708ce4f28f76e2905e69d68a7ff6a2c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc50f02bc708ce4f28f76e2905e69d68a7ff6a2c

Author: Carl Worth <cworth at cworth.org>
Date:   Mon Dec  3 15:43:16 2012 -0800

driconf: Add option definitions to source file, not generated target

For the last two most-recently-added driconf options, their definition was
manually added to options.h, a file which is intended to be automatically
generated, (as part of support for translated driconf option
descriptions). This means that these options would be eliminated if the
generation step were performed again.

Fix this by correctly adding the definitions of these options to t_options.h,
(the file used as input to the generator), and not the options.h file, which
is generated.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/common/xmlpool/t_options.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/common/xmlpool/t_options.h b/src/mesa/drivers/dri/common/xmlpool/t_options.h
index e2d4aae..78f1765 100644
--- a/src/mesa/drivers/dri/common/xmlpool/t_options.h
+++ b/src/mesa/drivers/dri/common/xmlpool/t_options.h
@@ -272,3 +272,13 @@ DRI_CONF_OPT_END
 DRI_CONF_OPT_BEGIN(always_flush_cache,bool,def) \
         DRI_CONF_DESC(en,gettext("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,gettext("Force GLSL extension default behavior to 'warn'")) \
+DRI_CONF_OPT_END
+
+#define DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED(def) \
+DRI_CONF_OPT_BEGIN(disable_blend_func_extended,bool,def) \
+        DRI_CONF_DESC(en,gettext("Disable dual source blending")) \
+DRI_CONF_OPT_END




More information about the mesa-commit mailing list