diff options
| author | Marek Olšák <[email protected]> | 2018-01-26 14:25:53 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-01-29 21:15:52 -0700 |
| commit | f96a69f916aed40519e755d0460a83940a58780e (patch) | |
| tree | 6515058fbd5ad07f986e1b31df217ae7910c7ab1 /src/mesa/vbo/vbo_save.h | |
| parent | 94843e60562c52975325f59f21cb1c8e89f2fe20 (diff) | |
mesa: replace GLenum with GLenum16 in common structures (v4)
v2: - fix glGet*
- also use GLenum16 for DrawBuffers
v3: - rebase to top of tree (BrianP) and incorporate Ian's suggestions
v4: - fix a GLenum16 bug in VBO/save code, add some STATIC_ASSERT()s
gl_context = 152432 -> 136840 bytes
vbo_context = 22096 -> 20608 bytes
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/vbo/vbo_save.h')
| -rw-r--r-- | src/mesa/vbo/vbo_save.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h index 51ea9ccb3d0..1dc66a598e3 100644 --- a/src/mesa/vbo/vbo_save.h +++ b/src/mesa/vbo/vbo_save.h @@ -63,7 +63,7 @@ struct vbo_save_copied_vtx { struct vbo_save_vertex_list { GLbitfield64 enabled; /**< mask of enabled vbo arrays. */ GLubyte attrsz[VBO_ATTRIB_MAX]; - GLenum attrtype[VBO_ATTRIB_MAX]; + GLenum16 attrtype[VBO_ATTRIB_MAX]; GLuint vertex_size; /**< size in GLfloats */ /* Copy of the final vertex from node->vertex_store->bufferobj. @@ -144,7 +144,7 @@ struct vbo_save_context { GLbitfield64 enabled; /**< mask of enabled vbo arrays. */ GLubyte attrsz[VBO_ATTRIB_MAX]; /**< 1, 2, 3 or 4 */ - GLenum attrtype[VBO_ATTRIB_MAX]; /**< GL_FLOAT, GL_INT, etc */ + GLenum16 attrtype[VBO_ATTRIB_MAX]; /**< GL_FLOAT, GL_INT, etc */ GLubyte active_sz[VBO_ATTRIB_MAX]; /**< 1, 2, 3 or 4 */ GLuint vertex_size; /**< size in GLfloats */ |