summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-07-27 16:10:35 -0600
committerBrian Paul <brianp@vmware.com>2012-07-27 16:10:58 -0600
commitf612e55e45402c14b2099238e8d41e911932fd26 (patch)
treeebc9ceafb20f5a1ba4cc307012a17035487db2da
parent322a2938f320f8a39cb6d86f249a339625a8772a (diff)
downloadexternal_mesa3d-f612e55e45402c14b2099238e8d41e911932fd26.zip
external_mesa3d-f612e55e45402c14b2099238e8d41e911932fd26.tar.gz
external_mesa3d-f612e55e45402c14b2099238e8d41e911932fd26.tar.bz2
st/mesa: undo a couple static asserts
Hmm, gcc didn't catch these mistakes, but MSVC did.
-rw-r--r--src/mesa/state_tracker/st_atom_depth.c4
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;
}