summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/i965simple/brw_sf_state.c
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-12-23 16:01:59 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-12-23 16:01:59 +1100
commit6c14cf58343135491068e96575bf4e61a6d34c87 (patch)
tree0b826725f867a706d558492ac9abf881ab06e7a5 /src/mesa/pipe/i965simple/brw_sf_state.c
parentbf2410ca73d1eabc7134e51855d0b603897229e4 (diff)
parent4fa7afabc966a3d37324f2f9b03e1cc466db7773 (diff)
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/i965simple/brw_sf_state.c')
-rw-r--r--src/mesa/pipe/i965simple/brw_sf_state.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/pipe/i965simple/brw_sf_state.c b/src/mesa/pipe/i965simple/brw_sf_state.c
index 0de6e7240e..9acd3ea61b 100644
--- a/src/mesa/pipe/i965simple/brw_sf_state.c
+++ b/src/mesa/pipe/i965simple/brw_sf_state.c
@@ -58,9 +58,9 @@ static void upload_sf_vp(struct brw_context *brw)
/* _NEW_SCISSOR */
sfv.scissor.xmin = brw->attribs.Scissor.minx;
- sfv.scissor.xmax = brw->attribs.Scissor.maxx;
+ sfv.scissor.xmax = brw->attribs.Scissor.maxx - 1;
sfv.scissor.ymin = brw->attribs.Scissor.miny;
- sfv.scissor.ymax = brw->attribs.Scissor.maxy;
+ sfv.scissor.ymax = brw->attribs.Scissor.maxy - 1;
brw->sf.vp_gs_offset = brw_cache_data( &brw->cache[BRW_SF_VP], &sfv );
}
@@ -133,7 +133,7 @@ static void upload_sf_unit( struct brw_context *brw )
else
sf.sf6.cull_mode = BRW_CULLMODE_NONE;
#else
- sf.sf5.front_winding = BRW_FRONTWINDING_CW;
+ sf.sf5.front_winding = BRW_FRONTWINDING_CCW;
sf.sf6.cull_mode = BRW_CULLMODE_NONE;
#endif
@@ -149,7 +149,7 @@ static void upload_sf_unit( struct brw_context *brw )
sf.sf7.sprite_point = brw->attribs.Raster->point_sprite;
sf.sf7.point_size = CLAMP(brw->attribs.Raster->line_width, 1.0, 255.0) * (1<<3);
- sf.sf7.use_point_size_state = brw->attribs.Raster->point_size_per_vertex;
+ sf.sf7.use_point_size_state = !brw->attribs.Raster->point_size_per_vertex;
/* might be BRW_NEW_PRIMITIVE if we have to adjust pv for polygons:
*/