KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "llvmpipe: try to keep plane c values small" 

This reverts commit 9773722c2b.

Looks like there are some floor/rounding issues here that need
to be better understood.
This commit is contained in:
Keith Whitwell 2010-10-12 13:20:39 +01:00
parent 22ec25e2bf
commit 0ca0382d1b
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/llvmpipe/lp_setup_line.c
View File

@ -640,7 +640,8 @@ try_setup_line( struct lp_setup_context *setup,
}
}
plane->c = (plane->c + (FIXED_ONE-1)) / FIXED_ONE;
plane->dcdx *= FIXED_ONE;
plane->dcdy *= FIXED_ONE;
/* find trivial reject offsets for each edge for a single-pixel
* sized block. These will be scaled up at each recursive level to

38
src/gallium/drivers/llvmpipe/lp_setup_tri.c
View File

@ -343,34 +343,26 @@ do_triangle_ccw(struct lp_setup_context *setup,
* Also, sometimes (in FBO cases) GL will render upside down
* to its usual method, in which case it will probably want
* to use the opposite, top-left convention.
*
* XXX: Chances are this will get stripped away. In fact this
* is only meaningful if:
*
* (plane->c & (FIXED_ONE-1)) == 0
*
*/
if ((plane->c & (FIXED_ONE-1)) == 0) {
if (plane->dcdx < 0) {
/* both fill conventions want this - adjust for left edges */
plane->c++;
if (plane->dcdx < 0) {
/* both fill conventions want this - adjust for left edges */
plane->c++;
}
else if (plane->dcdx == 0) {
if (setup->pixel_offset == 0) {
/* correct for top-left fill convention:
*/
if (plane->dcdy > 0) plane->c++;
}
else if (plane->dcdx == 0) {
if (setup->pixel_offset == 0) {
/* correct for top-left fill convention:
*/
if (plane->dcdy > 0) plane->c++;
}
else {
/* correct for bottom-left fill convention:
*/
if (plane->dcdy < 0) plane->c++;
}
else {
/* correct for bottom-left fill convention:
*/
if (plane->dcdy < 0) plane->c++;
}
}
plane->c = (plane->c + (FIXED_ONE-1)) / FIXED_ONE;
plane->dcdx *= FIXED_ONE;
plane->dcdy *= FIXED_ONE;
/* find trivial reject offsets for each edge for a single-pixel
* sized block. These will be scaled up at each recursive level to