diff options
author | José Fonseca <[email protected]> | 2013-04-23 19:40:05 +0100 |
---|---|---|
committer | José Fonseca <[email protected]> | 2013-04-23 19:42:47 +0100 |
commit | 2737abb44efebfa10ac84b183c20fc5818d1514e (patch) | |
tree | 32447cf1ab7291a489bca9dd770c3e424785dbd9 /src/gallium/auxiliary/vl | |
parent | b69207642079fe8ba33c594750415e8d9c66a06f (diff) |
gallium: Replace gl_rasterization_rules with lower_left_origin and half_pixel_center.
Squashed commit of the following:
commit 04c5fa2cbb8e89d6f2fa5a75af1cca03b1f6b852
Author: José Fonseca <[email protected]>
Date: Tue Apr 23 17:37:18 2013 +0100
gallium: s/lower_left_origin/bottom_edge_rule/
commit 4dff4f64fa83b9737def136fffd161d55e4f1722
Author: José Fonseca <[email protected]>
Date: Tue Apr 23 17:35:04 2013 +0100
gallium: Move diagram to docs.
commit 442a63012c8c3c3797f45e03f2ca20ad5f399832
Author: James Benton <[email protected]>
Date: Fri May 11 17:50:55 2012 +0100
gallium: Replace gl_rasterization_rules with lower_left_origin and half_pixel_center.
This change is necessary to achieve correct results when using OpenGL
FBOs.
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/vl')
-rw-r--r-- | src/gallium/auxiliary/vl/vl_compositor.c | 3 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_idct.c | 3 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_matrix_filter.c | 3 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_mc.c | 3 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_median_filter.c | 3 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_zscan.c | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index fecf3c9287f..0df2b570d00 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -453,7 +453,8 @@ init_pipe_state(struct vl_compositor *c) rast.point_size_per_vertex = 1; rast.offset_units = 1; rast.offset_scale = 1; - rast.gl_rasterization_rules = 1; + rast.half_pixel_center = 1; + rast.bottom_edge_rule = 1; rast.depth_clip = 1; c->rast = c->pipe->create_rasterizer_state(c->pipe, &rast); diff --git a/src/gallium/auxiliary/vl/vl_idct.c b/src/gallium/auxiliary/vl/vl_idct.c index a0c243f809a..bd73dfd40f7 100644 --- a/src/gallium/auxiliary/vl/vl_idct.c +++ b/src/gallium/auxiliary/vl/vl_idct.c @@ -516,7 +516,8 @@ init_state(struct vl_idct *idct) memset(&rs_state, 0, sizeof(rs_state)); rs_state.point_size = 1; - rs_state.gl_rasterization_rules = true; + rs_state.half_pixel_center = true; + rs_state.bottom_edge_rule = true; rs_state.depth_clip = 1; idct->rs_state = idct->pipe->create_rasterizer_state(idct->pipe, &rs_state); if (!idct->rs_state) diff --git a/src/gallium/auxiliary/vl/vl_matrix_filter.c b/src/gallium/auxiliary/vl/vl_matrix_filter.c index 438bedab226..cda90ff10eb 100644 --- a/src/gallium/auxiliary/vl/vl_matrix_filter.c +++ b/src/gallium/auxiliary/vl/vl_matrix_filter.c @@ -168,7 +168,8 @@ vl_matrix_filter_init(struct vl_matrix_filter *filter, struct pipe_context *pipe filter->pipe = pipe; memset(&rs_state, 0, sizeof(rs_state)); - rs_state.gl_rasterization_rules = true; + rs_state.half_pixel_center = true; + rs_state.bottom_edge_rule = true; rs_state.depth_clip = 1; filter->rs_state = pipe->create_rasterizer_state(pipe, &rs_state); if (!filter->rs_state) diff --git a/src/gallium/auxiliary/vl/vl_mc.c b/src/gallium/auxiliary/vl/vl_mc.c index d395cc2d57c..b4272093655 100644 --- a/src/gallium/auxiliary/vl/vl_mc.c +++ b/src/gallium/auxiliary/vl/vl_mc.c @@ -428,7 +428,8 @@ init_pipe_state(struct vl_mc *r) rs_state.sprite_coord_mode = PIPE_SPRITE_COORD_UPPER_LEFT; rs_state.point_quad_rasterization = true; rs_state.point_size = VL_BLOCK_WIDTH; - rs_state.gl_rasterization_rules = true; + rs_state.half_pixel_center = true; + rs_state.bottom_edge_rule = true; rs_state.depth_clip = 1; r->rs_state = r->pipe->create_rasterizer_state(r->pipe, &rs_state); if (!r->rs_state) diff --git a/src/gallium/auxiliary/vl/vl_median_filter.c b/src/gallium/auxiliary/vl/vl_median_filter.c index dfa280a6d2a..2db147904b8 100644 --- a/src/gallium/auxiliary/vl/vl_median_filter.c +++ b/src/gallium/auxiliary/vl/vl_median_filter.c @@ -254,7 +254,8 @@ vl_median_filter_init(struct vl_median_filter *filter, struct pipe_context *pipe filter->pipe = pipe; memset(&rs_state, 0, sizeof(rs_state)); - rs_state.gl_rasterization_rules = true; + rs_state.half_pixel_center = true; + rs_state.bottom_edge_rule = true; rs_state.depth_clip = 1; filter->rs_state = pipe->create_rasterizer_state(pipe, &rs_state); if (!filter->rs_state) diff --git a/src/gallium/auxiliary/vl/vl_zscan.c b/src/gallium/auxiliary/vl/vl_zscan.c index 53c2e801c2d..262fb0dc491 100644 --- a/src/gallium/auxiliary/vl/vl_zscan.c +++ b/src/gallium/auxiliary/vl/vl_zscan.c @@ -270,7 +270,8 @@ init_state(struct vl_zscan *zscan) assert(zscan); memset(&rs_state, 0, sizeof(rs_state)); - rs_state.gl_rasterization_rules = true; + rs_state.half_pixel_center = true; + rs_state.bottom_edge_rule = true; rs_state.depth_clip = 1; zscan->rs_state = zscan->pipe->create_rasterizer_state(zscan->pipe, &rs_state); if (!zscan->rs_state) |