mesa: Make gl_array_object::_Enabled 64 bits.
Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
ed42c25807
commit
f364ac1da1
|
@ -54,7 +54,7 @@ static void
|
||||||
client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
|
client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
|
||||||
{
|
{
|
||||||
struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
|
struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
|
||||||
GLuint flag;
|
GLbitfield64 flag;
|
||||||
GLboolean *var;
|
GLboolean *var;
|
||||||
|
|
||||||
switch (cap) {
|
switch (cap) {
|
||||||
|
|
|
@ -173,39 +173,39 @@ typedef enum
|
||||||
* These are used in bitfields in many places.
|
* These are used in bitfields in many places.
|
||||||
*/
|
*/
|
||||||
/*@{*/
|
/*@{*/
|
||||||
#define VERT_BIT_POS (1 << VERT_ATTRIB_POS)
|
#define VERT_BIT_POS BITFIELD64_BIT(VERT_ATTRIB_POS)
|
||||||
#define VERT_BIT_WEIGHT (1 << VERT_ATTRIB_WEIGHT)
|
#define VERT_BIT_WEIGHT BITFIELD64_BIT(VERT_ATTRIB_WEIGHT)
|
||||||
#define VERT_BIT_NORMAL (1 << VERT_ATTRIB_NORMAL)
|
#define VERT_BIT_NORMAL BITFIELD64_BIT(VERT_ATTRIB_NORMAL)
|
||||||
#define VERT_BIT_COLOR0 (1 << VERT_ATTRIB_COLOR0)
|
#define VERT_BIT_COLOR0 BITFIELD64_BIT(VERT_ATTRIB_COLOR0)
|
||||||
#define VERT_BIT_COLOR1 (1 << VERT_ATTRIB_COLOR1)
|
#define VERT_BIT_COLOR1 BITFIELD64_BIT(VERT_ATTRIB_COLOR1)
|
||||||
#define VERT_BIT_FOG (1 << VERT_ATTRIB_FOG)
|
#define VERT_BIT_FOG BITFIELD64_BIT(VERT_ATTRIB_FOG)
|
||||||
#define VERT_BIT_COLOR_INDEX (1 << VERT_ATTRIB_COLOR_INDEX)
|
#define VERT_BIT_COLOR_INDEX BITFIELD64_BIT(VERT_ATTRIB_COLOR_INDEX)
|
||||||
#define VERT_BIT_POINT_SIZE (1 << VERT_ATTRIB_POINT_SIZE)
|
#define VERT_BIT_POINT_SIZE BITFIELD64_BIT(VERT_ATTRIB_POINT_SIZE)
|
||||||
#define VERT_BIT_EDGEFLAG (1 << VERT_ATTRIB_EDGEFLAG)
|
#define VERT_BIT_EDGEFLAG BITFIELD64_BIT(VERT_ATTRIB_EDGEFLAG)
|
||||||
#define VERT_BIT_TEX0 (1 << VERT_ATTRIB_TEX0)
|
#define VERT_BIT_TEX0 BITFIELD64_BIT(VERT_ATTRIB_TEX0)
|
||||||
#define VERT_BIT_TEX1 (1 << VERT_ATTRIB_TEX1)
|
#define VERT_BIT_TEX1 BITFIELD64_BIT(VERT_ATTRIB_TEX1)
|
||||||
#define VERT_BIT_TEX2 (1 << VERT_ATTRIB_TEX2)
|
#define VERT_BIT_TEX2 BITFIELD64_BIT(VERT_ATTRIB_TEX2)
|
||||||
#define VERT_BIT_TEX3 (1 << VERT_ATTRIB_TEX3)
|
#define VERT_BIT_TEX3 BITFIELD64_BIT(VERT_ATTRIB_TEX3)
|
||||||
#define VERT_BIT_TEX4 (1 << VERT_ATTRIB_TEX4)
|
#define VERT_BIT_TEX4 BITFIELD64_BIT(VERT_ATTRIB_TEX4)
|
||||||
#define VERT_BIT_TEX5 (1 << VERT_ATTRIB_TEX5)
|
#define VERT_BIT_TEX5 BITFIELD64_BIT(VERT_ATTRIB_TEX5)
|
||||||
#define VERT_BIT_TEX6 (1 << VERT_ATTRIB_TEX6)
|
#define VERT_BIT_TEX6 BITFIELD64_BIT(VERT_ATTRIB_TEX6)
|
||||||
#define VERT_BIT_TEX7 (1 << VERT_ATTRIB_TEX7)
|
#define VERT_BIT_TEX7 BITFIELD64_BIT(VERT_ATTRIB_TEX7)
|
||||||
#define VERT_BIT_GENERIC0 (1 << VERT_ATTRIB_GENERIC0)
|
#define VERT_BIT_GENERIC0 BITFIELD64_BIT(VERT_ATTRIB_GENERIC0)
|
||||||
|
|
||||||
#define VERT_BIT(i) (1 << (i))
|
#define VERT_BIT(i) BITFIELD64_BIT(i)
|
||||||
#define VERT_BIT_ALL ((1 << VERT_ATTRIB_MAX) - 1)
|
#define VERT_BIT_ALL (BITFIELD64_BIT(VERT_ATTRIB_MAX) - 1)
|
||||||
|
|
||||||
#define VERT_BIT_FF(i) VERT_BIT(i)
|
#define VERT_BIT_FF(i) VERT_BIT(i)
|
||||||
#define VERT_BIT_FF_ALL ((1 << VERT_ATTRIB_FF_MAX) - 1)
|
#define VERT_BIT_FF_ALL (BITFIELD64_BIT(VERT_ATTRIB_FF_MAX) - 1)
|
||||||
#define VERT_BIT_TEX(i) VERT_BIT(VERT_ATTRIB_TEX(i))
|
#define VERT_BIT_TEX(i) VERT_BIT(VERT_ATTRIB_TEX(i))
|
||||||
#define VERT_BIT_TEX_ALL \
|
#define VERT_BIT_TEX_ALL \
|
||||||
(((1 << VERT_ATTRIB_TEX_MAX) - 1) << VERT_ATTRIB_TEX(0))
|
((BITFIELD64_BIT(VERT_ATTRIB_TEX_MAX) - 1) << VERT_ATTRIB_TEX(0))
|
||||||
#define VERT_BIT_GENERIC_NV(i) VERT_BIT(VERT_ATTRIB_GENERIC_NV(i))
|
#define VERT_BIT_GENERIC_NV(i) VERT_BIT(VERT_ATTRIB_GENERIC_NV(i))
|
||||||
#define VERT_BIT_GENERIC_NV_ALL \
|
#define VERT_BIT_GENERIC_NV_ALL \
|
||||||
(((1 << VERT_ATTRIB_GENERIC_NV_MAX) - 1) << (VERT_ATTRIB_GENERIC_NV(0)))
|
((BITFIELD64_BIT(VERT_ATTRIB_GENERIC_NV_MAX) - 1) << (VERT_ATTRIB_GENERIC_NV(0)))
|
||||||
#define VERT_BIT_GENERIC(i) VERT_BIT(VERT_ATTRIB_GENERIC(i))
|
#define VERT_BIT_GENERIC(i) VERT_BIT(VERT_ATTRIB_GENERIC(i))
|
||||||
#define VERT_BIT_GENERIC_ALL \
|
#define VERT_BIT_GENERIC_ALL \
|
||||||
(((1 << VERT_ATTRIB_GENERIC_MAX) - 1) << (VERT_ATTRIB_GENERIC(0)))
|
((BITFIELD64_BIT(VERT_ATTRIB_GENERIC_MAX) - 1) << (VERT_ATTRIB_GENERIC(0)))
|
||||||
/*@}*/
|
/*@}*/
|
||||||
|
|
||||||
|
|
||||||
|
@ -1631,7 +1631,7 @@ struct gl_array_object
|
||||||
struct gl_client_array VertexAttrib[MAX_VERTEX_GENERIC_ATTRIBS];
|
struct gl_client_array VertexAttrib[MAX_VERTEX_GENERIC_ATTRIBS];
|
||||||
|
|
||||||
/** Mask of VERT_BIT_* values indicating which arrays are enabled */
|
/** Mask of VERT_BIT_* values indicating which arrays are enabled */
|
||||||
GLbitfield _Enabled;
|
GLbitfield64 _Enabled;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Min of all enabled arrays' _MaxElement. When arrays reside inside VBOs
|
* Min of all enabled arrays' _MaxElement. When arrays reside inside VBOs
|
||||||
|
@ -1665,7 +1665,7 @@ struct gl_array_attrib
|
||||||
GLboolean PrimitiveRestart;
|
GLboolean PrimitiveRestart;
|
||||||
GLuint RestartIndex;
|
GLuint RestartIndex;
|
||||||
|
|
||||||
GLbitfield NewState; /**< mask of VERT_BIT_* values */
|
GLbitfield64 NewState; /**< mask of VERT_BIT_* values */
|
||||||
GLboolean RebindArrays; /**< whether the VBO module should rebind arrays */
|
GLboolean RebindArrays; /**< whether the VBO module should rebind arrays */
|
||||||
|
|
||||||
/* GL_ARB_vertex_buffer_object */
|
/* GL_ARB_vertex_buffer_object */
|
||||||
|
|
|
@ -124,7 +124,7 @@ static void
|
||||||
update_array(struct gl_context *ctx,
|
update_array(struct gl_context *ctx,
|
||||||
const char *func,
|
const char *func,
|
||||||
struct gl_client_array *array,
|
struct gl_client_array *array,
|
||||||
GLbitfield dirtyBit, GLbitfield legalTypesMask,
|
GLbitfield64 dirtyBit, GLbitfield legalTypesMask,
|
||||||
GLint sizeMin, GLint sizeMax,
|
GLint sizeMin, GLint sizeMax,
|
||||||
GLint size, GLenum type, GLsizei stride,
|
GLint size, GLenum type, GLsizei stride,
|
||||||
GLboolean normalized, GLboolean integer,
|
GLboolean normalized, GLboolean integer,
|
||||||
|
|
Loading…
Reference in New Issue