Mesa (master): mesa: remove array size so the static assert can work
Brian Paul
brianp at kemper.freedesktop.org
Mon Oct 29 23:57:04 UTC 2012
Module: Mesa
Branch: master
Commit: aab0ea935290cdbf6c74e4d001d4bbc8178fc14a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aab0ea935290cdbf6c74e4d001d4bbc8178fc14a
Author: Brian Paul <brianp at vmware.com>
Date: Sat Oct 27 09:13:03 2012 -0600
mesa: remove array size so the static assert can work
With the explit NUM_TEXTURE_TARGETS array size, the assertion that
Elements(targets) == NUM_TEXTURE_TARGETS would pass even if elements
were missing.
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mesa/main/shared.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index fab2995..2d2f7bd 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -89,7 +89,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
/* Create default texture objects */
for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
/* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
- static const GLenum targets[NUM_TEXTURE_TARGETS] = {
+ static const GLenum targets[] = {
GL_TEXTURE_BUFFER,
GL_TEXTURE_2D_ARRAY_EXT,
GL_TEXTURE_1D_ARRAY_EXT,
More information about the mesa-commit
mailing list