21 lines
824 B
Diff
21 lines
824 B
Diff
|
commit b4bf9acc32ac8693b1fdf80f351523a468ba6bd1
|
||
|
|
Author: Xiang, Haihao <haihao.xiang@intel.com>
|
||
|
|
Date: Tue Oct 21 10:30:39 2008 +0800
|
||
|
|
|
||
|
|
i915: fix carsh in i830_emit_state. (bug #17766)
|
||
|
|
|
||
|
|
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
|
||
|
|
index 773a8b4..3c9851e 100644
|
||
|
|
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
|
||
|
|
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
|
||
|
|
@@ -449,7 +449,8 @@ i830_emit_state(struct intel_context *intel)
|
||
|
|
aper_array[aper_count++] = intel->batch->buf;
|
||
|
|
if (dirty & I830_UPLOAD_BUFFERS) {
|
||
|
|
aper_array[aper_count++] = state->draw_region->buffer;
|
||
|
|
- aper_array[aper_count++] = state->depth_region->buffer;
|
||
|
|
+ if (state->depth_region)
|
||
|
|
+ aper_array[aper_count++] = state->depth_region->buffer;
|
||
|
|
}
|
||
|
|
|
||
|
|
for (i = 0; i < I830_TEX_UNITS; i++)
|