Merge Jose's documentation and core Mesa changes from embedded branch

1 files changed, 82 insertions, 53 deletions

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 4b4b3ef10ae..ebbdeaa7048 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -1,3 +1,8 @@
+/**
+ * \file config.h
+ * Tunable configuration parameters.
+ */
+
 /*
  * Mesa 3-D graphics library
  * Version:  5.1
@@ -23,12 +28,6 @@
  */
 
 
-/*
- * Tunable configuration parameters.
- */
-
-
-
 #ifndef CONFIG_H
 #define CONFIG_H
 
@@ -37,113 +36,126 @@
 #endif
 
 
-/*
- * OpenGL implementation limits
+/**
+ * \name OpenGL implementation limits
  */
+/*@{*/
 
-/* Maximum modelview matrix stack depth: */
+/** Maximum modelview matrix stack depth */
 #define MAX_MODELVIEW_STACK_DEPTH 32
 
-/* Maximum projection matrix stack depth: */
+/** Maximum projection matrix stack depth */
 #define MAX_PROJECTION_STACK_DEPTH 32
 
-/* Maximum texture matrix stack depth: */
+/** Maximum texture matrix stack depth */
 #define MAX_TEXTURE_STACK_DEPTH 10
 
-/* Maximum color matrix stack depth: */
+/** Maximum color matrix stack depth */
 #define MAX_COLOR_STACK_DEPTH 4
 
-/* Maximum attribute stack depth: */
+/** Maximum attribute stack depth */
 #define MAX_ATTRIB_STACK_DEPTH 16
 
-/* Maximum client attribute stack depth: */
+/** Maximum client attribute stack depth */
 #define MAX_CLIENT_ATTRIB_STACK_DEPTH 16
 
-/* Maximum recursion depth of display list calls: */
+/** Maximum recursion depth of display list calls */
 #define MAX_LIST_NESTING 64
 
-/* Maximum number of lights: */
+/** Maximum number of lights */
 #define MAX_LIGHTS 8
 
-/* Maximum user-defined clipping planes: */
+/** Maximum user-defined clipping planes */
 #define MAX_CLIP_PLANES 6
 
-/* Maximum pixel map lookup table size: */
+/** Maximum pixel map lookup table size */
 #define MAX_PIXEL_MAP_TABLE 256
 
-/* Number of auxillary color buffers: */
+/** Number of auxillary color buffers */
 #define NUM_AUX_BUFFERS 0
 
-/* Maximum order (degree) of curves: */
+/** Maximum order (degree) of curves */
 #ifdef AMIGA
 #   define MAX_EVAL_ORDER 12
 #else
 #   define MAX_EVAL_ORDER 30
 #endif
 
-/* Maximum Name stack depth */
+/** Maximum Name stack depth */
 #define MAX_NAME_STACK_DEPTH 64
 
-/* Min and Max point sizes and granularity */
+/** Minimum point size */
 #define MIN_POINT_SIZE 1.0
+/** Maximum point size */
 #define MAX_POINT_SIZE 20.0
+/** Point size granularity */
 #define POINT_SIZE_GRANULARITY 0.1
 
-/* Min and Max line widths and granularity */
+/** Minimum line width */
 #define MIN_LINE_WIDTH 1.0
+/** Maximum line width */
 #define MAX_LINE_WIDTH 10.0
+/** Line width granularity */
 #define LINE_WIDTH_GRANULARITY 0.1
 
-/* Max texture palette / color table size */
+/** Max texture palette / color table size */
 #define MAX_COLOR_TABLE_SIZE 256
 
-/* Number of 1D/2D texture mipmap levels */
+/** Number of 1D/2D texture mipmap levels */
 #define MAX_TEXTURE_LEVELS 12
 
-/* Number of 3D texture mipmap levels */
+/** Number of 3D texture mipmap levels */
 #define MAX_3D_TEXTURE_LEVELS 9
 
-/* Number of cube texture mipmap levels - GL_ARB_texture_cube_map */
+/** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */
 #define MAX_CUBE_TEXTURE_LEVELS 12
 
-/* Maximum rectangular texture size - GL_NV_texture_rectangle */
+/** Maximum rectangular texture size - GL_NV_texture_rectangle */
 #define MAX_TEXTURE_RECT_SIZE 2048
 
-/* Number of texture units - GL_ARB_multitexture */
+/** Number of texture units - GL_ARB_multitexture */
 #define MAX_TEXTURE_UNITS 8
 
-/* New: separate numbers of texture coordinates and texture image units.
+/**
+ * \name Separate numbers of texture coordinates and texture image units.
+ *
  * These values will eventually replace most instances of MAX_TEXTURE_UNITS.
  * We should always have MAX_TEXTURE_COORD_UNITS <= MAX_TEXTURE_IMAGE_UNITS.
  * And, GL_MAX_TEXTURE_UNITS <= MAX_TEXTURE_COORD_UNITS.
  */
+/*@{*/
 #define MAX_TEXTURE_COORD_UNITS 8
 #define MAX_TEXTURE_IMAGE_UNITS 8
+/*@}*/
 
-/* Maximum viewport/image size (must accomodate all texture sizes too): */
+/** 
+ * Maximum viewport/image width. Must accomodate all texture sizes too. 
+ */
 #define MAX_WIDTH 2048
+/** Maximum viewport/image height */
 #define MAX_HEIGHT 2048
 
-/* Maxmimum size for CVA.  May be overridden by the drivers.  */
+/** Maxmimum size for CVA.  May be overridden by the drivers.  */
 #define MAX_ARRAY_LOCK_SIZE 3000
 
-/* Subpixel precision for antialiasing, window coordinate snapping */
+/** Subpixel precision for antialiasing, window coordinate snapping */
 #define SUB_PIXEL_BITS 4
 
-/* Size of histogram tables */
+/** Size of histogram tables */
 #define HISTOGRAM_TABLE_SIZE 256
 
-/* Max convolution filter sizes */
+/** Max convolution filter width */
 #define MAX_CONVOLUTION_WIDTH 9
+/** Max convolution filter height */
 #define MAX_CONVOLUTION_HEIGHT 9
 
-/* GL_ARB_texture_compression */
+/** GL_ARB_texture_compression */
 #define MAX_COMPRESSED_TEXTURE_FORMATS 25
 
-/* GL_EXT_texture_filter_anisotropic */
+/** GL_EXT_texture_filter_anisotropic */
 #define MAX_TEXTURE_MAX_ANISOTROPY 16.0
 
-/* GL_EXT_texture_lod_bias */
+/** GL_EXT_texture_lod_bias */
 #define MAX_TEXTURE_LOD_BIAS 4.0
 
 /* GL_NV_vertex_program */
@@ -175,28 +187,30 @@
 #define MAX_PROGRAM_MATRICES 8
 #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
 
+/*@}*/
 
 
-
-/*
- * Mesa-specific parameters
+/**
+ * \name Mesa-specific parameters
  */
+/*@{*/
 
 
-/*
+/**
  * Bits per accumulation buffer color component:  8, 16 or 32
  */
 #define ACCUM_BITS 16
 
-
-/*
- * Bits per depth buffer value.  Any reasonable value up to 31 will
- * work.  32 doesn't work because of integer overflow problems in the
- * rasterizer code.
+/**
+ * Bits per depth buffer value.  
+ *
+ * Any reasonable value up to 31 will work.  32 doesn't work because of integer
+ * overflow problems in the rasterizer code.
  */
 #ifndef DEFAULT_SOFTWARE_DEPTH_BITS
 #define DEFAULT_SOFTWARE_DEPTH_BITS 16
 #endif
+/** Depth buffer data type */
 #if DEFAULT_SOFTWARE_DEPTH_BITS <= 16
 #define DEFAULT_SOFTWARE_DEPTH_TYPE GLushort
 #else
@@ -204,14 +218,13 @@
 #endif
 
 
-
-/*
- * Bits per stencil value:  8
+/**
+ * Bits per stencil value: 8
  */
 #define STENCIL_BITS 8
 
 
-/*
+/**
  * Bits per color channel:  8, 16 or 32
  */
 #ifndef CHAN_BITS
@@ -221,19 +234,27 @@
 
 /*
  * Color channel component order
- * (changes will almost certainly cause problems at this time)
+ * 
+ * \note Changes will almost certainly cause problems at this time.
  */
 #define RCOMP 0
 #define GCOMP 1
 #define BCOMP 2
 #define ACOMP 3
 
-
+#ifndef _HAVE_FULL_GL
+#define _HAVE_FULL_GL 1
+#endif
 
 /*
  * Enable/disable features (blocks of code) by setting FEATURE_xyz to 0 or 1.
  */
+#if _HAVE_FULL_GL
 #define FEATURE_NV_vertex_program 1
+#define FEATURE_userclip 1
+#define FEATURE_texgen 1
+#define FEATURE_windowpos 1
+#endif
 
 #define FEATURE_NV_fragment_program 1
 
@@ -245,4 +266,12 @@
 
 #define FEATURE_ARB_occlusion_query 1
 
+/*@}*/
+
+
+#ifndef _HAVE_FULL_GL
+#define _HAVE_FULL_GL 1
+#endif
+
+
 #endif /* CONFIG_H */