diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-02-25 19:26:30 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-02-25 19:26:30 +0000 |
| commit | a10be7fb8546d985b532cabfca95d56726e79856 (patch) | |
| tree | 833dc9f780e247de03fbcf185e62d8c158921108 /src | |
| parent | 4039cb8ca82d59451a6de8902fe35e693cdca3ba (diff) | |
fix-up pixel_format enum stuff
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/x11/xmesaP.h | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 64b94d6eaf..46886eb9c6 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -1,4 +1,4 @@ -/* $Id: xmesaP.h,v 1.34 2003/02/17 16:36:04 brianp Exp $ */ +/* $Id: xmesaP.h,v 1.35 2003/02/25 19:26:30 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -62,6 +62,26 @@ typedef void (*clear_func)( GLcontext *ctx, GLint width, GLint height ); + + +/** Framebuffer pixel formats */ +enum pixel_format { + 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 */ +}; + + /* * "Derived" from GLvisual. Basically corresponds to an XVisualInfo. */ @@ -81,8 +101,8 @@ struct xmesa_visual { GLboolean ximage_flag; /* Use XImage for back buffer (not pixmap)? */ - GLuint dithered_pf; /* Pixel format when dithering */ - GLuint undithered_pf; /* Pixel format when not dithering */ + enum pixel_format dithered_pf; /* Pixel format when dithering */ + enum pixel_format undithered_pf;/* Pixel format when not dithering */ GLfloat RedGamma; /* Gamma values, 1.0 is default */ GLfloat GreenGamma; @@ -113,7 +133,6 @@ struct xmesa_visual { }; - /* * "Derived" from __GLcontextRec. Basically corresponds to a GLXContext. */ @@ -128,25 +147,7 @@ struct xmesa_context { GLboolean swapbytes; /* Host byte order != display byte order? */ GLboolean direct; /* Direct rendering context? */ - /** 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; - - - + enum pixel_format pixelformat; GLubyte clearcolor[4]; /* current clearing color */ unsigned long clearpixel; /* current clearing pixel value */ |