diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-28 23:31:50 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-28 23:31:50 +0100 |
| commit | 9715b7fab0757c86e1bb151f3dce0b324bcff692 (patch) | |
| tree | 805e01d9e21e3f5316e8827dd59173a7a5cfd4ae /mesalib/src/mesa/main/mtypes.h | |
| parent | 0fd2d56b0fc0ce74c5f3e5e23cb26b0d1a075ba1 (diff) | |
| download | vcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.tar.gz vcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.tar.bz2 vcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.zip | |
xserver libX11 mesa xkeyboard-config git update 28 dec 2011
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
| -rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 02452aa68..107371e52 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -56,6 +56,12 @@ typedef GLuint64 GLbitfield64; /** Set a single bit */ #define BITFIELD64_BIT(b) ((GLbitfield64)1 << (b)) +/** Set all bits up to excluding bit b */ +#define BITFIELD64_MASK(b) \ + ((b) == 64 ? (~(GLbitfield64)0) : BITFIELD64_BIT(b) - 1) +/** Set count bits starting from bit b */ +#define BITFIELD64_RANGE(b, count) \ + (BITFIELD64_MASK((b) + (count)) & ~BITFIELD64_MASK(b)) /** @@ -683,8 +689,6 @@ struct gl_light GLfloat _MatAmbient[2][3]; /**< material ambient * light ambient */ GLfloat _MatDiffuse[2][3]; /**< material diffuse * light diffuse */ GLfloat _MatSpecular[2][3]; /**< material spec * light specular */ - GLfloat _dli; /**< CI diffuse light intensity */ - GLfloat _sli; /**< CI specular light intensity */ /*@}*/ }; |