From: Brian Paul <brianp@vmware.com>
Date: Sat, 27 Oct 2012 15:13:03 +0000 (-0600)
Subject: mesa: remove array size so the static assert can work
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aab0ea935290cdbf6c74e4d001d4bbc8178fc14a;p=mesa.git

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@anholt.net>
---

diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index fab2995a49c..2d2f7bd1d78 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,