diff options
| author | Ben Skeggs <[email protected]> | 2008-03-16 12:49:46 +1100 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-03-16 12:49:46 +1100 |
| commit | c4354f84603cabb0e33ea3f586cc89bfdc27f79b (patch) | |
| tree | 01585e52a3cca102c212630d8bac345058e150f6 /src/gallium/drivers/i915simple/i915_state.c | |
| parent | 5e17088ee3d0ddfa8871d92d262bb5242bdd92bd (diff) | |
| parent | cb98f71d42e4c714dfb0c3e29d28d8418a1ee86b (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_state.c')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/i915simple/i915_state.c b/src/gallium/drivers/i915simple/i915_state.c index 503c0924003..1cec36e206d 100644 --- a/src/gallium/drivers/i915simple/i915_state.c +++ b/src/gallium/drivers/i915simple/i915_state.c @@ -516,7 +516,7 @@ static void i915_set_constant_buffer(struct pipe_context *pipe, * stays the same. In that case we should only be updating the first * N constants, leaving any extras from shader translation alone. */ - { + if (buf) { void *mapped; if (buf->size && (mapped = ws->buffer_map(ws, buf->buffer, |