diff options
author | marha <marha@users.sourceforge.net> | 2011-10-06 08:50:17 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-10-06 08:50:17 +0200 |
commit | 543c5ecf97b067fe5e0824f996c227e30ee693b0 (patch) | |
tree | 7207e6216bd20423b473153e10d1975ca17700fd /mesalib/src/mesa/main/mtypes.h | |
parent | a411d3abb8352c0f65fd4f045d825c0b023dadf4 (diff) | |
parent | b520df571e0a319eae5231d09f36b98f28b8914a (diff) | |
download | vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.gz vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.bz2 vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.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 | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 67db4df8f..c97c0bf80 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -73,10 +73,7 @@ struct _mesa_HashTable; struct gl_attrib_node; struct gl_list_extensions; struct gl_meta_state; -struct gl_pixelstore_attrib; struct gl_program_cache; -struct gl_texture_format; -struct gl_texture_image; struct gl_texture_object; struct gl_context; struct st_context; @@ -214,9 +211,10 @@ typedef enum VERT_RESULT_BFC0 = 13, VERT_RESULT_BFC1 = 14, VERT_RESULT_EDGE = 15, - VERT_RESULT_CLIP_DIST0 = 16, - VERT_RESULT_CLIP_DIST1 = 17, - VERT_RESULT_VAR0 = 18, /**< shader varying */ + VERT_RESULT_CLIP_VERTEX = 16, + VERT_RESULT_CLIP_DIST0 = 17, + VERT_RESULT_CLIP_DIST1 = 18, + VERT_RESULT_VAR0 = 19, /**< shader varying */ VERT_RESULT_MAX = (VERT_RESULT_VAR0 + MAX_VARYING) } gl_vert_result; @@ -1268,13 +1266,6 @@ struct gl_texture_image GLuint *ImageOffsets; /**< if 3D texture: array [Depth] of offsets to each 2D slice in 'Data', in texels */ GLvoid *Data; /**< Image data, accessed via FetchTexel() */ - - /** - * \name For device driver: - */ - /*@{*/ - void *DriverData; /**< Arbitrary device driver data */ - /*@}*/ }; @@ -1492,13 +1483,20 @@ struct gl_texture_attrib /** + * Data structure representing a single clip plane (e.g. one of the elements + * of the ctx->Transform.EyeUserPlane or ctx->Transform._ClipUserPlane array). + */ +typedef GLfloat gl_clip_plane[4]; + + +/** * Transformation attribute group (GL_TRANSFORM_BIT). */ struct gl_transform_attrib { GLenum MatrixMode; /**< Matrix mode */ - GLfloat EyeUserPlane[MAX_CLIP_PLANES][4]; /**< User clip planes */ - GLfloat _ClipUserPlane[MAX_CLIP_PLANES][4]; /**< derived */ + gl_clip_plane EyeUserPlane[MAX_CLIP_PLANES]; /**< User clip planes */ + gl_clip_plane _ClipUserPlane[MAX_CLIP_PLANES]; /**< derived */ GLbitfield ClipPlanesEnabled; /**< on/off bitmask */ GLboolean Normalize; /**< Normalize all normals? */ GLboolean RescaleNormals; /**< GL_EXT_rescale_normal */ |