projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
322a293
)
st/mesa: undo a couple static asserts
author
Brian Paul
<brianp@vmware.com>
Fri, 27 Jul 2012 22:10:35 +0000
(16:10 -0600)
committer
Brian Paul
<brianp@vmware.com>
Fri, 27 Jul 2012 22:10:58 +0000
(16:10 -0600)
Hmm, gcc didn't catch these mistakes, but MSVC did.
src/mesa/state_tracker/st_atom_depth.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_atom_depth.c
b/src/mesa/state_tracker/st_atom_depth.c
index 373e1584b852ee5b389c7d20b08e901a87d7e09a..c76a6d8c60615f649b59e1aeb41ee7fc0e7fb0b0 100644
(file)
--- 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;
}