diff options
| author | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
| commit | 64e57ed257c559ea31cf162c67a7ef61fdc562e4 (patch) | |
| tree | dee99970e9d1e6d892f21db31488470bc7929d18 /src/mesa/tnl_dd/t_dd_tritmp.h | |
| parent | dabd09f5a92e5497ac6ac9b4ba26f806ddb25206 (diff) | |
| parent | 4fab47b13c214dc79e0ae5d8001521029ce34231 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
Diffstat (limited to 'src/mesa/tnl_dd/t_dd_tritmp.h')
| -rw-r--r-- | src/mesa/tnl_dd/t_dd_tritmp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/tnl_dd/t_dd_tritmp.h b/src/mesa/tnl_dd/t_dd_tritmp.h index 2bb890593b1..1ae70f4059f 100644 --- a/src/mesa/tnl_dd/t_dd_tritmp.h +++ b/src/mesa/tnl_dd/t_dd_tritmp.h @@ -267,7 +267,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) GLfloat bc = b * ic; if ( ac < 0.0f ) ac = -ac; if ( bc < 0.0f ) bc = -bc; - offset += MAX2( ac, bc ) * ctx->Polygon.OffsetFactor; + offset += MAX2( ac, bc ) * ctx->Polygon.OffsetFactor / ctx->DrawBuffer->_MRD; } offset *= ctx->DrawBuffer->_MRD * (REVERSE_DEPTH ? -1.0 : 1.0); } @@ -539,7 +539,7 @@ static void TAG(quadr)( GLcontext *ctx, GLfloat bc = b * ic; if ( ac < 0.0f ) ac = -ac; if ( bc < 0.0f ) bc = -bc; - offset += MAX2( ac, bc ) * ctx->Polygon.OffsetFactor; + offset += MAX2( ac, bc ) * ctx->Polygon.OffsetFactor / ctx->DrawBuffer->_MRD; } offset *= ctx->DrawBuffer->_MRD * (REVERSE_DEPTH ? -1.0 : 1.0); } |