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_draw.c | |
| 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_draw.c')
| -rw-r--r-- | src/mesa/vbo/vbo_save_draw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index c86efcb05ee..fd0ccc1230a 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -141,10 +141,12 @@ bind_vertex_list(struct gl_context *ctx, const GLubyte *map; GLuint attr; GLubyte node_attrsz[VBO_ATTRIB_MAX]; /* copy of node->attrsz[] */ - GLenum node_attrtype[VBO_ATTRIB_MAX]; /* copy of node->attrtype[] */ + GLenum16 node_attrtype[VBO_ATTRIB_MAX]; /* copy of node->attrtype[] */ GLbitfield varying_inputs = 0x0; + STATIC_ASSERT(sizeof(node_attrsz) == sizeof(node->attrsz)); memcpy(node_attrsz, node->attrsz, sizeof(node->attrsz)); + STATIC_ASSERT(sizeof(node_attrtype) == sizeof(node->attrtype)); memcpy(node_attrtype, node->attrtype, sizeof(node->attrtype)); if (aligned_vertex_buffer_offset(node)) { |