diff options
| author | nathanh <nathanh> | 2001-01-08 16:21:33 +0000 |
|---|---|---|
| committer | nathanh <nathanh> | 2001-01-08 16:21:33 +0000 |
| commit | 7af30f12574da3401f5edec89a51504e3fc3a082 (patch) | |
| tree | 8ee363cf298930f7a52ff2320a43dd86e277377f /xc/lib/GL/mesa/src/drv/sis/sis_span.c | |
| parent | 58a7f55466fde1831eae5cdf235a8880f45c6543 (diff) | |
Merged tdfx-3-0-0tdfx-3-0-0-20010109-merge
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/sis/sis_span.c')
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/sis/sis_span.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_span.c b/xc/lib/GL/mesa/src/drv/sis/sis_span.c index 70fbd7f64..5bd6e6f63 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_span.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_span.c @@ -51,14 +51,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define CLIPPIXEL(_x,_y) (_x >= minx && _x < maxx && \ _y >= miny && _y < maxy) -#define CLIPSPAN(_x,_y,_n,_x1,_n1,_i) \ - if (_y < miny || _y >= maxy) _n1 = 0, _x1 = x; \ - else { \ - _n1 = _n; \ - _x1 = _x; \ - if (_x1 < minx) _i += (minx - _x1), _x1 = minx; \ - if (_x1 + _n1 > maxx) n1 -= (_x1 + n1 - maxx); \ - } +#define CLIPSPAN( _x, _y, _n, _x1, _n1, _i ) \ + if ( _y < miny || _y >= maxy ) { \ + _n1 = 0, _x1 = x; \ + } else { \ + _n1 = _n; \ + _x1 = _x; \ + if ( _x1 < minx ) _i += (minx-_x1), n1 -= (minx-_x1), _x1 = minx; \ + if ( _x1 + _n1 >= maxx ) n1 -= (_x1 + n1 - maxx); \ + } #define HW_LOCK() do{}while(0); |