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/softpipe/sp_video_context.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/softpipe/sp_video_context.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_video_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_video_context.c b/src/gallium/drivers/softpipe/sp_video_context.c index 47767f985d..d8b5b31e95 100644 --- a/src/gallium/drivers/softpipe/sp_video_context.c +++ b/src/gallium/drivers/softpipe/sp_video_context.c @@ -166,7 +166,7 @@ init_pipe_state(struct sp_mpeg12_context *ctx) rast.scissor = 0; rast.poly_smooth = 0; rast.poly_stipple_enable = 0; - rast.point_sprite = 0; + rast.sprite_coord_enable = 0; rast.point_size_per_vertex = 0; rast.multisample = 0; rast.line_smooth = 0; @@ -177,10 +177,10 @@ init_pipe_state(struct sp_mpeg12_context *ctx) rast.bypass_vs_clip_and_viewport = 0; rast.line_width = 1; rast.point_smooth = 0; + rast.point_quad_rasterization = 0; rast.point_size = 1; rast.offset_units = 1; rast.offset_scale = 1; - /*rast.sprite_coord_mode[i] = ;*/ ctx->rast = ctx->pipe->create_rasterizer_state(ctx->pipe, &rast); ctx->pipe->bind_rasterizer_state(ctx->pipe, ctx->rast); |