diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
| commit | 46d4f558531910ca1f3297da85b99334d6de2921 (patch) | |
| tree | 60c37077eb160948fe317a17ec4c19bef679aa35 /mesalib/src/mesa/main/mtypes.h | |
| parent | 0bf6df93b9fdbb7902bf1014d605c6876a3ad035 (diff) | |
| parent | c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 (diff) | |
| download | vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.gz vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.bz2 vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/dpms.c
xorg-server/Xext/saver.c
xorg-server/Xext/security.c
xorg-server/Xext/shape.c
xorg-server/Xext/sync.c
xorg-server/Xi/opendev.c
xorg-server/fb/wfbrename.h
xorg-server/glx/glxserver.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/mi/miarc.c
xorg-server/mi/miwideline.c
xorg-server/os/io.c
xorg-server/render/mipict.c
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
| -rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 3b44ec6d5..42831d773 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -44,29 +44,6 @@ /** - * Color channel data type. - */ -#if CHAN_BITS == 8 - typedef GLubyte GLchan; -#define CHAN_MAX 255 -#define CHAN_MAXF 255.0F -#define CHAN_TYPE GL_UNSIGNED_BYTE -#elif CHAN_BITS == 16 - typedef GLushort GLchan; -#define CHAN_MAX 65535 -#define CHAN_MAXF 65535.0F -#define CHAN_TYPE GL_UNSIGNED_SHORT -#elif CHAN_BITS == 32 - typedef GLfloat GLchan; -#define CHAN_MAX 1.0 -#define CHAN_MAXF 1.0F -#define CHAN_TYPE GL_FLOAT -#else -#error "illegal number of color channel bits" -#endif - - -/** * Stencil buffer data type. */ #if STENCIL_BITS==8 @@ -1950,6 +1927,8 @@ struct gl_vertex_program_state GLboolean _Enabled; /**< Enabled and _valid_ user program? */ GLboolean PointSizeEnabled; /**< GL_VERTEX_PROGRAM_POINT_SIZE_ARB/NV */ GLboolean TwoSideEnabled; /**< GL_VERTEX_PROGRAM_TWO_SIDE_ARB/NV */ + /** Computed two sided lighting for fixed function/programs. */ + GLboolean _TwoSideEnabled; struct gl_vertex_program *Current; /**< User-bound vertex program */ /** Currently enabled and valid vertex program (including internal |