summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-03-04 17:15:45 -0800
committerEric Anholt <eric@anholt.net>2007-03-04 17:18:48 -0800
commitb27fa2c257ccc49c6f29a20a3e672ebaaf58e7aa (patch)
tree5981638f9494433aa3acefefb02923c066785da1 /src
parentfc7d43c2b6b98be597152fbd88024273edd931d0 (diff)
Fix a crash with XAA and DRI disabled after the allocation rework.
Diffstat (limited to 'src')
-rw-r--r--src/i830_xaa.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/i830_xaa.c b/src/i830_xaa.c
index f0951387..9ecf7067 100644
--- a/src/i830_xaa.c
+++ b/src/i830_xaa.c
@@ -279,12 +279,14 @@ CheckTiling(ScrnInfoPtr pScrn)
if (IS_I965G(pI830)) {
if (pI830->bufferOffset == pScrn->fbOffset && pI830->front_tiled == FENCE_XMAJOR)
tiled = 1;
- if (pI830->bufferOffset == pI830->back_buffer->offset &&
+ if (pI830->back_buffer != NULL &&
+ pI830->bufferOffset == pI830->back_buffer->offset &&
pI830->back_tiled == FENCE_XMAJOR) {
tiled = 1;
}
/* not really supported as it's always YMajor tiled */
- if (pI830->bufferOffset == pI830->depth_buffer->offset &&
+ if (pI830->depth_buffer != NULL &&
+ pI830->bufferOffset == pI830->depth_buffer->offset &&
pI830->depth_tiled == FENCE_XMAJOR) {
tiled = 1;
}