diff options
author | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
commit | e0058f158bae56c5a10cad4f9ace808a27022a9d (patch) | |
tree | 0daf3e4bafd8a1c53f8228c41ffd1637c158bb29 /mesalib/src/mesa/state_tracker/st_manager.c | |
parent | b639ce1e238ac06882d504aca591ab62475459c1 (diff) | |
parent | 77ec02adbc8f9657e7749b307d3cc86ccbd163ea (diff) | |
download | vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.gz vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.bz2 vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_manager.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c index ed668d248..e126c0a1e 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.c +++ b/mesalib/src/mesa/state_tracker/st_manager.c @@ -502,8 +502,8 @@ st_context_flush(struct st_context_iface *stctxi, unsigned flags, struct pipe_fence_handle **fence)
{
struct st_context *st = (struct st_context *) stctxi;
- st_flush(st, flags, fence);
- if (flags & PIPE_FLUSH_RENDER_CACHE)
+ st_flush(st, fence);
+ if (flags & ST_FLUSH_FRONT)
st_manager_flush_frontbuffer(st);
}
|