driconf: Add option definitions to source file, not generated target
authorCarl Worth <cworth@cworth.org>
Mon, 3 Dec 2012 23:43:16 +0000 (15:43 -0800)
committerCarl Worth <cworth@cworth.org>
Fri, 11 Jan 2013 21:54:54 +0000 (13:54 -0800)
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@whitecape.org>
src/mesa/drivers/dri/common/xmlpool/t_options.h

index e2d4aaee3eb708ce08fb3b5dd6649bae5ba097b8..78f17650b2cb11fe6ce5c65519b7223aa3535d07 100644 (file)
@@ -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