From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 23 Jan 2007 08:04:58 +0000 (+0100)
Subject: i915tex: Relocation fixes:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d46093b8d56f6d89b341d7437c5185ca6be597af;hp=fe9fef2cec2f9ed13370612a9a58df04b0075f15;p=mesa.git

i915tex: Relocation fixes:

Increase the number of allowed relocations per batchbuffer.
Fix an assert to avoid an array index overflow.
(Reported by Steve Wilkins)
---

diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
index be2750d041f..c92b83bcb3a 100644
--- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
@@ -311,7 +311,7 @@ intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch,
                              struct _DriBufferObject *buffer,
                              GLuint flags, GLuint mask, GLuint delta)
 {
-   assert(batch->nr_relocs <= MAX_RELOCS);
+   assert(batch->nr_relocs < MAX_RELOCS);
 
    driBOAddListItem(&batch->list, buffer, flags, mask);
 
diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h
index a83dbf423df..59261f72741 100644
--- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h
+++ b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h
@@ -9,7 +9,7 @@ struct intel_context;
 #define BATCH_SZ 16384
 #define BATCH_RESERVED 16
 
-#define MAX_RELOCS 100
+#define MAX_RELOCS 400
 
 #define INTEL_BATCH_NO_CLIPRECTS 0x1
 #define INTEL_BATCH_CLIPRECTS    0x2