Brian, Your fix is right. The last_fence variable was a remnant of some state tracker code I based the change on, and had no place here.
Jose On Wed, 2010-03-24 at 19:50 -0700, Brian Paul wrote: > Module: Mesa > Branch: master > Commit: 9a5241758231b2dd5ae757645158fa33051f5507 > URL: > http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a5241758231b2dd5ae757645158fa33051f5507 > > Author: Brian Paul <bri...@vmware.com> > Date: Wed Mar 24 20:40:31 2010 -0600 > > llvmpipe: fix up some questionable fence code > > Jose should probably review this since he wrote the original code. > > --- > > src/gallium/drivers/llvmpipe/lp_flush.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/src/gallium/drivers/llvmpipe/lp_flush.c > b/src/gallium/drivers/llvmpipe/lp_flush.c > index 636d72a..782669a 100644 > --- a/src/gallium/drivers/llvmpipe/lp_flush.c > +++ b/src/gallium/drivers/llvmpipe/lp_flush.c > @@ -111,7 +111,6 @@ llvmpipe_flush_texture(struct pipe_context *pipe, > boolean cpu_access, > boolean do_not_flush) > { > - struct pipe_fence_handle *last_fence = NULL; > unsigned referenced; > > referenced = pipe->is_texture_referenced(pipe, texture, face, level); > @@ -142,7 +141,7 @@ llvmpipe_flush_texture(struct pipe_context *pipe, > > pipe->flush(pipe, flush_flags, &fence); > > - if (last_fence) { > + if (fence) { > pipe->screen->fence_finish(pipe->screen, fence, 0); > pipe->screen->fence_reference(pipe->screen, &fence, NULL); > } > > _______________________________________________ > mesa-commit mailing list > mesa-com...@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-commit ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
