From b0dd74aaf730f59d5d29db71a3617ab9eb1cb62f Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sat, 5 Mar 2011 23:17:56 +0100 Subject: i915g: don't validate a NULL vbo With the new clear code this is possible (if the app call glClear before drawing the first primitive). Signed-off-by: Daniel Vetter --- src/gallium/drivers/i915/i915_state_emit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/gallium/drivers/i915/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c index 15350c0a5d7..324a8a3e158 100644 --- a/src/gallium/drivers/i915/i915_state_emit.c +++ b/src/gallium/drivers/i915/i915_state_emit.c @@ -119,7 +119,7 @@ validate_immediate(struct i915_context *i915, unsigned *batch_space) 1 << I915_IMMEDIATE_S5 | 1 << I915_IMMEDIATE_S6) & i915->immediate_dirty; - if (i915->immediate_dirty & (1 << I915_IMMEDIATE_S0)) + if (i915->immediate_dirty & (1 << I915_IMMEDIATE_S0) && i915->vbo) i915->validation_buffers[i915->num_validation_buffers++] = i915->vbo; *batch_space = 1 + util_bitcount(dirty); -- cgit v1.2.3