summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-06-29 15:27:49 -0600
committerBrian Paul <[email protected]>2009-06-29 15:27:49 -0600
commitb8c479d4b0519bde0e395ea669b017b6a6188146 (patch)
tree31a7fdc1e5100f709c1075250096e150703d8ec2 /src/mesa
parent423f45d18a665423e319dcea08c11ff9f5646a80 (diff)
parent4e43126a5915b1233c89c61400c8270d23d48ea3 (diff)
Merge branch 'mesa_7_5_branch'
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/intel/intel_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index f77e823ca08..33b2d074995 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -539,7 +539,7 @@ intelFinish(GLcontext * ctx)
irb = intel_renderbuffer(fb->_ColorDrawBuffers[i]);
- if (irb->region)
+ if (irb && irb->region)
dri_bo_wait_rendering(irb->region->buffer);
}
if (fb->_DepthBuffer) {