Mesa (master): mesa: Convert some runtime asserts to static asserts.

Eric Anholt anholt at kemper.freedesktop.org
Mon Sep 23 19:50:16 UTC 2013


Module: Mesa
Branch: master
Commit: 669b88eb12496dd5f1ba933a56c8311624245639
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=669b88eb12496dd5f1ba933a56c8311624245639

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Sep 19 20:06:35 2013 -0700

mesa: Convert some runtime asserts to static asserts.

Noticed while grepping through the code for something else.

v2: Don't convert really-runtime asserts to static asserts.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at .intel.com>

---

 src/mesa/program/program.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index 2529c13..3a1eb73 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -72,10 +72,10 @@ _mesa_init_program(struct gl_context *ctx)
    ASSERT(ctx->Const.FragmentProgram.MaxAddressOffset <= (1 << INST_INDEX_BITS));
 
    /* If this fails, increase prog_instruction::TexSrcUnit size */
-   ASSERT(MAX_TEXTURE_UNITS <= (1 << 5));
+   STATIC_ASSERT(MAX_TEXTURE_UNITS <= (1 << 5));
 
    /* If this fails, increase prog_instruction::TexSrcTarget size */
-   ASSERT(NUM_TEXTURE_TARGETS <= (1 << 4));
+   STATIC_ASSERT(NUM_TEXTURE_TARGETS <= (1 << 4));
 
    ctx->Program.ErrorPos = -1;
    ctx->Program.ErrorString = _mesa_strdup("");




More information about the mesa-commit mailing list