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/drivers/dri/nouveau/nv04_state_frag.c | 4 ++-- src/mesa/drivers/dri/nouveau/nv10_state_frag.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mesa/drivers/dri/nouveau') diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_frag.c b/src/mesa/drivers/dri/nouveau/nv04_state_frag.c index 248a7d2b522..bfe8eaea123 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_state_frag.c +++ b/src/mesa/drivers/dri/nouveau/nv04_state_frag.c @@ -49,8 +49,8 @@ struct combiner_state { /* GL state */ GLenum mode; - GLenum *source; - GLenum *operand; + GLenum16 *source; + GLenum16 *operand; GLuint logscale; /* Derived HW state */ diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_frag.c b/src/mesa/drivers/dri/nouveau/nv10_state_frag.c index c6e4bb0d587..42dff085ca5 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_state_frag.c +++ b/src/mesa/drivers/dri/nouveau/nv10_state_frag.c @@ -67,8 +67,8 @@ struct combiner_state { /* GL state */ GLenum mode; - GLenum *source; - GLenum *operand; + GLenum16 *source; + GLenum16 *operand; GLuint logscale; /* Derived HW state */ -- cgit v1.2.3