X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fcommon%2Fxmlpool.h;h=587517ea10ab46ff78e3e4431aeab99d7876647f;hb=6538b5824e298eaebede2d9686c7607c44ab446a;hp=c1553734782d2128c0c78118a374ac496c76eb00;hpb=bcc6eddd335e97d49ed2ef3a1440f94d58dce12d;p=mesa.git

diff --git a/src/mesa/drivers/dri/common/xmlpool.h b/src/mesa/drivers/dri/common/xmlpool.h
index c1553734782..587517ea10a 100644
--- a/src/mesa/drivers/dri/common/xmlpool.h
+++ b/src/mesa/drivers/dri/common/xmlpool.h
@@ -1,14 +1,3 @@
-/* -*- mode:C; coding: mult-utf-8-unix -*-
- *
- * !!! Important: This file is encoded in UTF-8 !!!
- *
- * Note (Emacs): You need Mule. In Debian the package is called
- * mule-ucs.
- *
- * Note (Emacs): You may have to enable multibyte characters in the
- * Mule customization group or by setting
- * default-enable-multibyte-characters to t in your .emacs:
- */
 /*
  * XML DRI client-side driver configuration
  * Copyright (C) 2003 Felix Kuehling
@@ -37,8 +26,11 @@
  * \brief Pool of common options
  * \author Felix Kuehling
  *
- * This file defines macros that can be used to construct driConfigOptions
- * in the drivers.
+ * This file defines macros that can be used to construct
+ * driConfigOptions in the drivers. Common options are defined in
+ * xmlpool/t_options.h from which xmlpool/options.h is generated with
+ * translations. This file defines generic helper macros and includes
+ * xmlpool/options.h.
  */
 
 #ifndef __XMLPOOL_H
@@ -68,6 +60,10 @@
 #define DRI_CONF_OPT_BEGIN(name,type,def) \
 "<option name=\""#name"\" type=\""#type"\" default=\""#def"\">\n"
 
+/** \brief Begin an option definition with qouted default value */
+#define DRI_CONF_OPT_BEGIN_Q(name,type,def) \
+"<option name=\""#name"\" type=\""#type"\" default="#def">\n"
+
 /** \brief Begin an option definition with restrictions on valid values */
 #define DRI_CONF_OPT_BEGIN_V(name,type,def,valid) \
 "<option name=\""#name"\" type=\""#type"\" default=\""#def"\" valid=\""valid"\">\n"
@@ -92,112 +88,11 @@
 #define DRI_CONF_ENUM(value,text) \
 "<enum value=\""#value"\" text=\""text"\"/>\n"
 
+
 /*
- * predefined option sections and options with multi-lingual descriptions
+ * Predefined option sections and options with multi-lingual descriptions
+ * are now automatically generated.
  */
-
-/** \brief Debugging options */
-#define DRI_CONF_SECTION_DEBUG \
-DRI_CONF_SECTION_BEGIN \
-	DRI_CONF_DESC(en,"Debugging") \
-	DRI_CONF_DESC(de,"Fehlersuche")
-
-#define DRI_CONF_NO_RAST(def) \
-DRI_CONF_OPT_BEGIN(no_rast,bool,def) \
-        DRI_CONF_DESC(en,"Disable 3D acceleration") \
-        DRI_CONF_DESC(de,"3D-Beschleunigung abschalten") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_PERFORMANCE_BOXES(def) \
-DRI_CONF_OPT_BEGIN(performance_boxes,bool,def) \
-        DRI_CONF_DESC(en,"Show performance boxes") \
-        DRI_CONF_DESC(de,"Zeige Performanceboxen") \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_DEBUG_DMA(def) \
-DRI_CONF_OPT_BEGIN(debug_dma,bool,def) \
-	DRI_CONF_DESC(en,"Debug DMA buffers") \
-	DRI_CONF_DESC(de,"DMA Puffer debuggen") \
-DRI_CONF_OPT_END
-
-
-/** \brief Texture-related options */
-#define DRI_CONF_SECTION_QUALITY \
-DRI_CONF_SECTION_BEGIN \
-	DRI_CONF_DESC(en,"Image Quality") \
-	DRI_CONF_DESC(de,"Bildqualität")
-
-#define DRI_CONF_PREFERRED_BPT(def,valid) \
-DRI_CONF_OPT_BEGIN_V(preferred_bpt,enum,def,valid) \
-	DRI_CONF_DESC_BEGIN(en,"Preferred texture color depth") \
-                DRI_CONF_ENUM(0,"Same as frame buffer") \
-        DRI_CONF_DESC_END \
-	DRI_CONF_DESC_BEGIN(de,"Bevorzugte Textur Farbtiefe") \
-                DRI_CONF_ENUM(0,"So wie der Framebuffer") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-/** \brief Performance-related options */
-#define DRI_CONF_SECTION_PERFORMANCE \
-DRI_CONF_SECTION_BEGIN \
-        DRI_CONF_DESC(en,"Performance") \
-        DRI_CONF_DESC(de,"Leistung")
-
-#define DRI_CONF_TCL_SW 0
-#define DRI_CONF_TCL_PIPELINED 1
-#define DRI_CONF_TCL_VTXFMT 2
-#define DRI_CONF_TCL_CODEGEN 3
-#define DRI_CONF_TCL_MODE(def) \
-DRI_CONF_OPT_BEGIN_V(tcl_mode,enum,def,"0:3") \
-        DRI_CONF_DESC_BEGIN(en,"TCL mode (Transformation, Clipping, Lighting)") \
-                DRI_CONF_ENUM(0,"Software") \
-                DRI_CONF_ENUM(1,"TCL stage in MESA pipeline") \
-                DRI_CONF_ENUM(2,"Bypass MESA's pipeline") \
-                DRI_CONF_ENUM(3,"Bypass MESA's pipeline with state-based code generation") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(de,"TCL Modus (Transformation, Clipping, Licht)") \
-                DRI_CONF_ENUM(0,"Software") \
-                DRI_CONF_ENUM(1,"TCL Stufe in MESA Pipeline") \
-                DRI_CONF_ENUM(2,"Umgehe MESA's Pipeline") \
-                DRI_CONF_ENUM(3,"Umgehe MESA's Pipeline mit zustandsbasierter Codegenerierung") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_FTHROTTLE_BUSY 0
-#define DRI_CONF_FTHROTTLE_USLEEPS 1
-#define DRI_CONF_FTHROTTLE_IRQS 2
-#define DRI_CONF_FTHROTTLE_MODE(def) \
-DRI_CONF_OPT_BEGIN_V(fthrottle_mode,enum,def,"0:2") \
-        DRI_CONF_DESC_BEGIN(en,"Frame throttling") \
-                DRI_CONF_ENUM(0,"Busy waiting") \
-                DRI_CONF_ENUM(1,"Usleeps") \
-                DRI_CONF_ENUM(2,"Software interrupts") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(de,"Framethrottling") \
-                DRI_CONF_ENUM(0,"Aktives Warten") \
-                DRI_CONF_ENUM(1,"Usleeps") \
-                DRI_CONF_ENUM(2,"Sortware Interrutps") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
-
-#define DRI_CONF_VBLANK_NEVER 0
-#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1
-#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
-#define DRI_CONF_VBLANK_ALWAYS_SYNC 3
-#define DRI_CONF_VBLANK_MODE(def) \
-DRI_CONF_OPT_BEGIN_V(vblank_mode,enum,def,"0:3") \
-        DRI_CONF_DESC_BEGIN(en,"Synchronization with vertical refresh (swap intervals)") \
-                DRI_CONF_ENUM(0,"Never, FPS rulez!") \
-                DRI_CONF_ENUM(1,"Application preference, default interval 0") \
-                DRI_CONF_ENUM(2,"Application preference, default interval 1") \
-                DRI_CONF_ENUM(3,"Application preference, always synchronize with refresh") \
-        DRI_CONF_DESC_END \
-        DRI_CONF_DESC_BEGIN(de,"Synchronisation mit dem vertikalen Bildaufbau (swap intervals)") \
-                DRI_CONF_ENUM(0,"Niemals, immer die maximale Framerate") \
-                DRI_CONF_ENUM(1,"Anwendung entscheidet, Standardinterval 0") \
-                DRI_CONF_ENUM(2,"Anwendung entscheidet, Standardinterval 1") \
-                DRI_CONF_ENUM(3,"Anwendung entscheidet, immer mit Bildaufbau synchronisieren") \
-        DRI_CONF_DESC_END \
-DRI_CONF_OPT_END
+#include "xmlpool/options.h"
 
 #endif