llvmpipe: Fix triangle bounding box calculation to be correctly inclusive or exclusive

Tested with custom rasterisation test tool added to piglit suite, reduced errors

Signed-off-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
James Benton 2012-05-10 17:15:28 +01:00 committed by José Fonseca
parent 0c8a8a35e1
commit 11aa82cc0b
1 changed files with 6 additions and 8 deletions

View File

@ -271,15 +271,13 @@ do_triangle_ccw(struct lp_setup_context *setup,
*/
int adj = (setup->pixel_offset != 0) ? 1 : 0;
bbox.x0 = (MIN3(x[0], x[1], x[2]) + (FIXED_ONE-1)) >> FIXED_ORDER;
bbox.x1 = (MAX3(x[0], x[1], x[2]) + (FIXED_ONE-1)) >> FIXED_ORDER;
bbox.y0 = (MIN3(y[0], y[1], y[2]) + (FIXED_ONE-1) + adj) >> FIXED_ORDER;
bbox.y1 = (MAX3(y[0], y[1], y[2]) + (FIXED_ONE-1) + adj) >> FIXED_ORDER;
/* Inclusive x0, exclusive x1 */
bbox.x0 = MIN3(x[0], x[1], x[2]) >> FIXED_ORDER;
bbox.x1 = (MAX3(x[0], x[1], x[2]) - 1) >> FIXED_ORDER;
/* Inclusive coordinates:
*/
bbox.x1--;
bbox.y1--;
/* Inclusive / exclusive depending upon adj (bottom-left or top-right) */
bbox.y0 = (MIN3(y[0], y[1], y[2]) + adj) >> FIXED_ORDER;
bbox.y1 = (MAX3(y[0], y[1], y[2]) - 1 + adj) >> FIXED_ORDER;
}
if (bbox.x1 < bbox.x0 ||