Mesa (master): st/mesa: undo a couple static asserts

Brian Paul brianp at kemper.freedesktop.org
Fri Jul 27 22:11:45 UTC 2012


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

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jul 27 16:10:35 2012 -0600

st/mesa: undo a couple static asserts

Hmm, gcc didn't catch these mistakes, but MSVC did.

---

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

diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index 373e158..c76a6d8 100644
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -57,8 +57,8 @@ st_compare_func_to_pipe(GLenum func)
    STATIC_ASSERT(PIPE_FUNC_NOTEQUAL == GL_NOTEQUAL - GL_NEVER);
    STATIC_ASSERT(PIPE_FUNC_GEQUAL == GL_GEQUAL - GL_NEVER);
    STATIC_ASSERT(PIPE_FUNC_ALWAYS == GL_ALWAYS - GL_NEVER);
-   STATIC_ASSERT(func >= GL_NEVER);
-   STATIC_ASSERT(func <= GL_ALWAYS);
+   assert(func >= GL_NEVER);
+   assert(func <= GL_ALWAYS);
    return func - GL_NEVER;
 }
 




More information about the mesa-commit mailing list