Mesa (mesa_7_2_branch): i915: fix carsh in i830_emit_state. (bug #17766)

Haihao Xiang haihao at kemper.freedesktop.org
Tue Oct 21 02:38:24 UTC 2008


Module: Mesa
Branch: mesa_7_2_branch
Commit: 48c29b60a899877c76d643b9cd06d5277cd97b9c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48c29b60a899877c76d643b9cd06d5277cd97b9c

Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Tue Oct 21 10:30:39 2008 +0800

i915: fix carsh in i830_emit_state. (bug #17766)

---

 src/mesa/drivers/dri/i915/i830_vtbl.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c
index c5a85fe..38f35dd 100644
--- a/src/mesa/drivers/dri/i915/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i830_vtbl.c
@@ -444,7 +444,8 @@ i830_emit_state(struct intel_context *intel)
    ret = 0;
    if (dirty & I830_UPLOAD_BUFFERS) {
      ret |= dri_bufmgr_check_aperture_space(state->draw_region->buffer);
-     ret |= dri_bufmgr_check_aperture_space(state->depth_region->buffer);
+     if (state->depth_region)
+         ret |= dri_bufmgr_check_aperture_space(state->depth_region->buffer);
    }
    
    for (i = 0; i < I830_TEX_UNITS; i++)




More information about the mesa-commit mailing list