i915tex: Relocation fixes:

Increase the number of allowed relocations per batchbuffer.
Fix an assert to avoid an array index overflow.
(Reported by Steve Wilkins)
This commit is contained in:
Thomas Hellstrom
2007-01-23 09:04:58 +01:00
parent fe9fef2cec
commit d46093b8d5
2 changed files with 2 additions and 2 deletions

View File

@@ -311,7 +311,7 @@ intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch,
struct _DriBufferObject *buffer, struct _DriBufferObject *buffer,
GLuint flags, GLuint mask, GLuint delta) GLuint flags, GLuint mask, GLuint delta)
{ {
assert(batch->nr_relocs <= MAX_RELOCS); assert(batch->nr_relocs < MAX_RELOCS);
driBOAddListItem(&batch->list, buffer, flags, mask); driBOAddListItem(&batch->list, buffer, flags, mask);

View File

@@ -9,7 +9,7 @@ struct intel_context;
#define BATCH_SZ 16384 #define BATCH_SZ 16384
#define BATCH_RESERVED 16 #define BATCH_RESERVED 16
#define MAX_RELOCS 100 #define MAX_RELOCS 400
#define INTEL_BATCH_NO_CLIPRECTS 0x1 #define INTEL_BATCH_NO_CLIPRECTS 0x1
#define INTEL_BATCH_CLIPRECTS 0x2 #define INTEL_BATCH_CLIPRECTS 0x2