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/drivers | |
| 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/drivers')
| -rw-r--r-- | src/mesa/drivers/common/meta.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv04_state_frag.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_state_frag.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 6d5185492d4..3d9c2917d2d 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -190,7 +190,7 @@ struct save_state struct gl_framebuffer *ReadBuffer; /** MESA_META_DRAW_BUFFERS */ - GLenum ColorDrawBuffers[MAX_DRAW_BUFFERS]; + GLenum16 ColorDrawBuffers[MAX_DRAW_BUFFERS]; }; /** 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 */ |