diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-06-30 16:28:37 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-06-30 16:28:54 +0100 |
| commit | 4147bb24d49a10498e00039fc1dc9aa5f1316777 (patch) | |
| tree | ceb027c40f52dd7e0471a3534bac7cd270b6953b /src/mesa/drivers/dri/intel/intel_context.c | |
| parent | 53f8dccd0c9ab0b55e24dd5d624bbaaf0c8c284b (diff) | |
| parent | 6af783bea0e171582f86c8456ca521ac242abc39 (diff) | |
Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit
Need this to pick up fixes for per-vertex materials.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 2 |
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 1222a9a8c6..90e66fa5c0 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -537,7 +537,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) { |