diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-02-17 16:35:56 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-02-17 16:35:56 +0000 |
| commit | 449e47f06a46c42fb9895d13f37b599600225e56 (patch) | |
| tree | ed1798bd1acf589b689a8c8c4630e4414265488d /src/mesa/drivers/x11/xmesaP.h | |
| parent | 85109b063c24945ec9d8e4878e961666cdf0039b (diff) | |
Replace some #defines with enums. (Klaus Niederkrueger)
Diffstat (limited to 'src/mesa/drivers/x11/xmesaP.h')
| -rw-r--r-- | src/mesa/drivers/x11/xmesaP.h | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 8afcba69be..64b94d6eaf 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -1,4 +1,4 @@ -/* $Id: xmesaP.h,v 1.33 2003/01/24 15:33:22 brianp Exp $ */ +/* $Id: xmesaP.h,v 1.34 2003/02/17 16:36:04 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -128,7 +128,25 @@ struct xmesa_context { GLboolean swapbytes; /* Host byte order != display byte order? */ GLboolean direct; /* Direct rendering context? */ - GLuint pixelformat; /* Current pixel format */ + /** Current pixel format */ + enum { + PF_Index, /**< Color Index mode */ + PF_Truecolor, /**< TrueColor or DirectColor, any depth */ + PF_Dither_True, /**< TrueColor with dithering */ + PF_8A8B8G8R, /**< 32-bit TrueColor: 8-A, 8-B, 8-G, 8-R */ + PF_8R8G8B, /**< 32-bit TrueColor: 8-R, 8-G, 8-B bits */ + PF_5R6G5B, /**< 16-bit TrueColor: 5-R, 6-G, 5-B bits */ + PF_Dither, /**< Color-mapped RGB with dither */ + PF_Lookup, /**< Color-mapped RGB without dither */ + PF_HPCR, /**< HP Color Recovery (ad@lms.be 30/08/95) */ + PF_1Bit, /**< monochrome dithering of RGB */ + PF_Grayscale, /**< Grayscale or StaticGray */ + PF_8R8G8B24, /**< 24-bit TrueColor: 8-R, 8-G, 8-B bits */ + PF_Dither_5R6G5B /**< 16-bit dithered TrueColor: 5-R, 6-G, 5-B */ + } pixelformat; + + + GLubyte clearcolor[4]; /* current clearing color */ unsigned long clearpixel; /* current clearing pixel value */ @@ -243,22 +261,6 @@ struct xmesa_buffer { #define BACK_XIMAGE 4 -/* Values for xmesa->pixelformat: */ -#define PF_INDEX 1 /* Color Index mode */ -#define PF_TRUECOLOR 2 /* TrueColor or DirectColor, any depth */ -#define PF_TRUEDITHER 3 /* TrueColor with dithering */ -#define PF_8A8B8G8R 4 /* 32-bit TrueColor: 8-A, 8-B, 8-G, 8-R */ -#define PF_8R8G8B 5 /* 32-bit TrueColor: 8-R, 8-G, 8-B bits */ -#define PF_5R6G5B 6 /* 16-bit TrueColor: 5-R, 6-G, 5-B bits */ -#define PF_DITHER 7 /* Color-mapped RGB with dither */ -#define PF_LOOKUP 8 /* Color-mapped RGB without dither */ -#define PF_HPCR 9 /* HP Color Recovery (ad@lms.be 30/08/95) */ -#define PF_1BIT 10 /* monochrome dithering of RGB */ -#define PF_GRAYSCALE 11 /* Grayscale or StaticGray */ -#define PF_8R8G8B24 12 /* 24-bit TrueColor: 8-R, 8-G, 8-B bits */ -#define PF_DITHER_5R6G5B 13 /* 16-bit dithered TrueColor: 5-R, 6-G, 5-B */ - - /* * If pixelformat==PF_TRUECOLOR: */ |