diff options
| author | Brian Paul <[email protected]> | 2012-02-20 13:13:55 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-02-24 08:03:15 -0700 |
| commit | 2b0aa3fb21386051976bf3c45e6455fc45d69bb3 (patch) | |
| tree | ae6175d31ed8b7ebfd593b610b87ac4e271ee3f5 /src/mesa | |
| parent | 7ad880f49ffc5662c1d9cd86e6a5c30dbe71784b (diff) | |
mesa: move more swrast-related #defines out of core Mesa
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/config.h | 40 | ||||
| -rw-r--r-- | src/mesa/swrast/s_chan.h | 8 | ||||
| -rw-r--r-- | src/mesa/swrast/swrast.h | 20 |
3 files changed, 28 insertions, 40 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index c70cc1818a5..8bf741f99ac 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -262,46 +262,6 @@ /*@}*/ -/** - * \name Mesa-specific parameters - */ -/*@{*/ - - -/** - * If non-zero use GLdouble for walking triangle edges, for better accuracy. - */ -#define TRIANGLE_WALK_DOUBLE 0 - - -/** - * Bits per depth buffer value (max is 32). - */ -#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 -#define DEFAULT_SOFTWARE_DEPTH_TYPE GLuint -#endif - - -/** - * Bits per stencil value: 8 - */ -#define STENCIL_BITS 8 - - -/** - * For swrast, bits per color channel: 8, 16 or 32 - */ -#ifndef CHAN_BITS -#define CHAN_BITS 8 -#endif - - /* * Color channel component order * diff --git a/src/mesa/swrast/s_chan.h b/src/mesa/swrast/s_chan.h index 94ac8b65be1..1db7fae4dff 100644 --- a/src/mesa/swrast/s_chan.h +++ b/src/mesa/swrast/s_chan.h @@ -36,6 +36,14 @@ /** + * Default bits per color channel: 8, 16 or 32 + */ +#ifndef CHAN_BITS +#define CHAN_BITS 8 +#endif + + +/** * Color channel data type. */ #if CHAN_BITS == 8 diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h index 15b07ed0d55..a299e6fda87 100644 --- a/src/mesa/swrast/swrast.h +++ b/src/mesa/swrast/swrast.h @@ -37,6 +37,26 @@ /** + * If non-zero use GLdouble for walking triangle edges, for better accuracy. + */ +#define TRIANGLE_WALK_DOUBLE 0 + + +/** + * Bits per depth buffer value (max is 32). + */ +#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 +#define DEFAULT_SOFTWARE_DEPTH_TYPE GLuint +#endif + + +/** * Max image/surface/texture size. */ #define SWRAST_MAX_WIDTH 16384 |