diff options
| author | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
| commit | 0eccb1038a620bc76ba45ac00c293b3e88427510 (patch) | |
| tree | 4bd9209ac6e9b824284d47799b13a99a401c6963 /src/gallium/winsys/i915/sw | |
| parent | ed12c29bc45b100b758c9affe2cebe8c8498e25e (diff) | |
| parent | 2e756f3d6f15d61297a3bb4efe6a88c29081a5eb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/winsys/i915/sw')
| -rw-r--r-- | src/gallium/winsys/i915/sw/i915_sw_batchbuffer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gallium/winsys/i915/sw/i915_sw_batchbuffer.c b/src/gallium/winsys/i915/sw/i915_sw_batchbuffer.c index 3d0c1fa6224..3bf54011d9e 100644 --- a/src/gallium/winsys/i915/sw/i915_sw_batchbuffer.c +++ b/src/gallium/winsys/i915/sw/i915_sw_batchbuffer.c @@ -49,7 +49,6 @@ i915_sw_batchbuffer_create(struct i915_winsys *iws) batch->base.size = 0; batch->base.relocs = 0; - batch->base.max_relocs = 300;/*INTEL_DEFAULT_RELOCS;*/ batch->base.iws = iws; @@ -75,8 +74,6 @@ i915_sw_batchbuffer_reloc(struct i915_winsys_batchbuffer *ibatch, struct i915_sw_batchbuffer *batch = i915_sw_batchbuffer(ibatch); int ret = 0; - assert(batch->base.relocs < batch->base.max_relocs); - if (usage == I915_USAGE_SAMPLER) { } else if (usage == I915_USAGE_RENDER) { |