diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-11 08:55:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-11 08:57:05 +0100 |
| commit | a73c45b7c72c6e426e1c75dd939f5481227b6979 (patch) | |
| tree | aba5ced82f492a7e28dfa683144dfbd6293d9613 /mesalib/src/mesa/state_tracker/st_atom_rasterizer.c | |
| parent | d60b5206a10c9d547a7230a991593b516e412204 (diff) | |
| parent | 38e661c7d82fa0b34fbe9b3f3261295787bb6427 (diff) | |
| download | vcxsrv-a73c45b7c72c6e426e1c75dd939f5481227b6979.tar.gz vcxsrv-a73c45b7c72c6e426e1c75dd939f5481227b6979.tar.bz2 vcxsrv-a73c45b7c72c6e426e1c75dd939f5481227b6979.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-trap.c
xorg-server/Xext/xace.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_rasterizer.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_rasterizer.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c index 2d6ad45ba..f3d28e675 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c @@ -261,6 +261,10 @@ static void update_raster_state( struct st_context *st ) /* _NEW_RASTERIZER_DISCARD */ raster->rasterizer_discard = ctx->RasterDiscard; + /* _NEW_TRANSFORM */ + raster->depth_clip = ctx->Transform.DepthClamp == GL_FALSE; + raster->clip_plane_enable = ctx->Transform.ClipPlanesEnabled; + cso_set_rasterizer(st->cso_context, raster); } @@ -276,7 +280,8 @@ const struct st_tracked_state st_update_rasterizer = { _NEW_PROGRAM | _NEW_SCISSOR | _NEW_FRAG_CLAMP | - _NEW_RASTERIZER_DISCARD), /* mesa state dependencies*/ + _NEW_RASTERIZER_DISCARD | + _NEW_TRANSFORM), /* mesa state dependencies*/ ST_NEW_VERTEX_PROGRAM, /* state tracker dependencies */ }, update_raster_state /* update function */ |