Mesa (master): Revert "llvmpipe: try to keep plane c values small"
Keith Whitwell
keithw at kemper.freedesktop.org
Tue Oct 12 12:21:23 UTC 2010
Module: Mesa
Branch: master
Commit: 0ca0382d1bfd1e9128fa4b588ce1411f7b8a85df
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ca0382d1bfd1e9128fa4b588ce1411f7b8a85df
Author: Keith Whitwell <keithw at vmware.com>
Date: Tue Oct 12 13:20:39 2010 +0100
Revert "llvmpipe: try to keep plane c values small"
This reverts commit 9773722c2b09d5f0615a47cecf4347859474dc56.
Looks like there are some floor/rounding issues here that need
to be better understood.
---
src/gallium/drivers/llvmpipe/lp_setup_line.c | 3 +-
src/gallium/drivers/llvmpipe/lp_setup_tri.c | 38 ++++++++++---------------
2 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_line.c b/src/gallium/drivers/llvmpipe/lp_setup_line.c
index c940860..693ac28 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_line.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_line.c
@@ -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
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_tri.c b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
index dfe1bd1..8fd0346 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_tri.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
@@ -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
More information about the mesa-commit
mailing list