projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3caaa3
)
Fix a dangerous use of ASSERT in an else-clause not enclosed in braces.
author
Brian Paul
<brian.paul@tungstengraphics.com>
Wed, 18 Oct 2006 17:36:57 +0000
(17:36 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Wed, 18 Oct 2006 17:36:57 +0000
(17:36 +0000)
We've been lucky if this hasn't been causing line rendering bugs.
src/mesa/tnl/t_vb_cliptmp.h
patch
|
blob
|
history
diff --git
a/src/mesa/tnl/t_vb_cliptmp.h
b/src/mesa/tnl/t_vb_cliptmp.h
index f3776e7eeb6ddfa26a1cbde1549c72ffd1673613..e5e379e151389b7594eeb2fb309b88185468f8fd 100644
(file)
--- a/
src/mesa/tnl/t_vb_cliptmp.h
+++ b/
src/mesa/tnl/t_vb_cliptmp.h
@@
-153,8
+153,9
@@
TAG(clip_line)( GLcontext *ctx, GLuint v0, GLuint v1, GLubyte mask )
v0 = newvert;
newvert++;
}
- else
+ else
{
ASSERT(t0 == 0.0);
+ }
if (VB->ClipMask[v1]) {
INTERP_4F( t1, coord[newvert], coord[v1], coord[v0] );
@@
-167,8
+168,9
@@
TAG(clip_line)( GLcontext *ctx, GLuint v0, GLuint v1, GLubyte mask )
newvert++;
}
- else
+ else
{
ASSERT(t1 == 0.0);
+ }
tnl->Driver.Render.ClippedLine( ctx, v0, v1 );
}