diff options
| author | Pauli Nieminen <suokkos@gmail.com> | 2009-08-24 00:57:05 +0300 |
|---|---|---|
| committer | Pauli Nieminen <suokkos@gmail.com> | 2009-08-24 00:57:05 +0300 |
| commit | 7bb0f880dbdee0c57693c3a1f331d7c0894e71e1 (patch) | |
| tree | c46a42d33501c1a9d56596981f50ce98746aa040 /src/gallium/winsys/drm/intel/gem/intel_be_context.c | |
| parent | effda2e2a7f8ef7406d698c6b31dbbff408ed112 (diff) | |
| parent | 4484ce9c7b196a686a3928f7e29dc8d9b6f3cae3 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
Diffstat (limited to 'src/gallium/winsys/drm/intel/gem/intel_be_context.c')
| -rw-r--r-- | src/gallium/winsys/drm/intel/gem/intel_be_context.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_context.c b/src/gallium/winsys/drm/intel/gem/intel_be_context.c index 629987c6f9..ff4518f868 100644 --- a/src/gallium/winsys/drm/intel/gem/intel_be_context.c +++ b/src/gallium/winsys/drm/intel/gem/intel_be_context.c @@ -57,9 +57,6 @@ intel_be_batch_flush(struct i915_winsys *sws, struct intel_be_context *intel = intel_be_context(sws); struct intel_be_fence **f = (struct intel_be_fence **)fence; - if (fence && *fence) - assert(0); - intel_be_batchbuffer_flush(intel->batch, f); } |