diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-02-09 19:32:21 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-02-09 19:32:21 +0100 |
| commit | 653a83445f94620673f747a4ace6847a2c7fdb4d (patch) | |
| tree | e2c6814da8d809813daffce530b37f3d283e96ff /src/gallium/drivers/nv50/nv50_state.c | |
| parent | b0613d87672ea08bb3b9cd56dee714fe413b670e (diff) | |
| parent | dd7be07c9685012b3e9fdfbaa13dc638abf6a9d1 (diff) | |
Merge branch 'gallium-nopointsizeminmax'
Conflicts:
src/gallium/drivers/nv10/nv10_state.c
src/gallium/drivers/nv20/nv20_state.c
src/gallium/drivers/nv50/nv50_program.c
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_state.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c index 7eb326adf5..7c531b50a5 100644 --- a/src/gallium/drivers/nv50/nv50_state.c +++ b/src/gallium/drivers/nv50/nv50_state.c @@ -342,7 +342,7 @@ nv50_rasterizer_state_create(struct pipe_context *pipe, so_data (so, fui(cso->point_size)); so_method(so, tesla, NV50TCL_POINT_SPRITE_ENABLE, 1); - so_data (so, cso->point_sprite); + so_data (so, cso->point_quad_rasterization ? 1 : 0); so_method(so, tesla, NV50TCL_POLYGON_MODE_FRONT, 3); if (cso->front_winding == PIPE_WINDING_CCW) { |