From f96a69f916aed40519e755d0460a83940a58780e Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Fri, 26 Jan 2018 14:25:53 -0700 Subject: mesa: replace GLenum with GLenum16 in common structures (v4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Nicolai Hähnle --- src/mesa/vbo/vbo_save_api.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/mesa/vbo/vbo_save_api.c') diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index 11c40a26429..a0fb62d8145 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -436,7 +436,9 @@ compile_vertex_list(struct gl_context *ctx) /* Duplicate our template, increment refcounts to the storage structs: */ node->enabled = save->enabled; + STATIC_ASSERT(sizeof(node->attrsz) == sizeof(save->attrsz)); memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz)); + STATIC_ASSERT(sizeof(node->attrtype) == sizeof(save->attrtype)); memcpy(node->attrtype, save->attrtype, sizeof(node->attrtype)); node->vertex_size = save->vertex_size; node->buffer_offset = -- cgit v1.2.3