diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2010-04-23 12:08:36 +0200 |
|---|---|---|
| committer | Jerome Glisse <jglisse@redhat.com> | 2010-04-23 12:08:36 +0200 |
| commit | ccd13da0fc1f1813b55fc0d2181a6cb0d3b42b0d (patch) | |
| tree | 3b7fd5f11394f21f5f1e383300a97dd1535b3397 /src/mesa/drivers | |
| parent | ff20543c815a14fddad1efaaef1610454a1924d4 (diff) | |
| parent | eb4dc547885994cc7961f7996c33ff484f664964 (diff) | |
Merge remote branch 'origin/7.8'
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_state.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c index 1da31e7b2b..ac64bbf874 100644 --- a/src/mesa/drivers/dri/r600/r700_state.c +++ b/src/mesa/drivers/dri/r600/r700_state.c @@ -253,12 +253,15 @@ void r700UpdateShaderStates(GLcontext * ctx) static void r700SetDepthState(GLcontext * ctx) { + struct radeon_renderbuffer *rrb; context_t *context = R700_CONTEXT(ctx); R700_CHIP_CONTEXT *r700 = (R700_CHIP_CONTEXT*)(&context->hw); R600_STATECHANGE(context, db); - if (ctx->Depth.Test) + rrb = radeon_get_depthbuffer(&context->radeon); + + if (ctx->Depth.Test && rrb && rrb->bo) { SETbit(r700->DB_DEPTH_CONTROL.u32All, Z_ENABLE_bit); if (ctx->Depth.Mask) |