diff options
author | marha <marha@users.sourceforge.net> | 2011-12-29 00:17:36 +0100 |
---|---|---|
committer | Marc Haesen <marc@hc-consult.be> | 2011-12-29 00:17:36 +0100 |
commit | d515b895dc5151d102f33b577cafbf63473bbafa (patch) | |
tree | 98986aec1f43152c3c5f4f8f8a19d29f88b42d83 /mesalib/src/mesa/main/mtypes.h | |
parent | ecb8be4d2a289c5308f3f23929116d2fe6aafa4b (diff) | |
parent | 9715b7fab0757c86e1bb151f3dce0b324bcff692 (diff) | |
download | vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.gz vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.bz2 vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.zip |
Merge remote-tracking branch 'origin/released'
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 */ /*@}*/ }; |