diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
| commit | 1e90ede4237374dfbb2c8c506a906233bcfd3c5d (patch) | |
| tree | 13b59b0ab2715fd0bb9eea788c73b08f3b07c01e /mesalib/src/mesa/swrast/s_span.c | |
| parent | baf98f9bb36f956245d83ecd04f90625d6d68d2b (diff) | |
| parent | 9f986778bd4393c5a9108426969d45aa7f10f334 (diff) | |
| download | vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.gz vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.bz2 vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/os.h
Diffstat (limited to 'mesalib/src/mesa/swrast/s_span.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_span.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c index 1aa20f9d7..e517c9ae1 100644 --- a/mesalib/src/mesa/swrast/s_span.c +++ b/mesalib/src/mesa/swrast/s_span.c @@ -707,11 +707,13 @@ clip_span( struct gl_context *ctx, SWspan *span ) const GLint n = span->end; GLubyte *mask = span->array->mask; GLint i; + GLuint passed = 0; if (span->arrayMask & SPAN_MASK) { /* note: using & intead of && to reduce branches */ for (i = 0; i < n; i++) { mask[i] &= (x[i] >= xmin) & (x[i] < xmax) & (y[i] >= ymin) & (y[i] < ymax); + passed += mask[i]; } } else { @@ -719,9 +721,10 @@ clip_span( struct gl_context *ctx, SWspan *span ) for (i = 0; i < n; i++) { mask[i] = (x[i] >= xmin) & (x[i] < xmax) & (y[i] >= ymin) & (y[i] < ymax); + passed += mask[i]; } } - return GL_TRUE; /* some pixels visible */ + return passed > 0; } else { /* horizontal span of pixels */ |