diff options
| author | Marek Olšák <maraeo@gmail.com> | 2012-02-21 19:03:14 +0100 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2012-02-23 20:29:55 +0100 |
| commit | 04d2828b03a75963a469f2fb008c3595948cfcfc (patch) | |
| tree | 00c1f8996aa616bd33f86443a5ecfcb4606f3ae6 | |
| parent | 99d5c1a13b97b9133a166c00c9fba1bec5f4bd9e (diff) | |
r600g: simplify fail paths in create_context
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index b2b79cd8e6e..53f9bd6554f 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -254,10 +254,8 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void LIST_INITHEAD(&rctx->enable_list); rctx->range = CALLOC(NUM_RANGES, sizeof(struct r600_range)); - if (!rctx->range) { - r600_destroy_context(&rctx->context); - return NULL; - } + if (!rctx->range) + goto fail; r600_init_blit_functions(rctx); r600_init_query_functions(rctx); @@ -275,26 +273,21 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void case R700: r600_init_state_functions(rctx); r600_init_atom_start_cs(rctx); - if (r600_context_init(rctx)) { - r600_destroy_context(&rctx->context); - return NULL; - } + if (r600_context_init(rctx)) + goto fail; rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx); break; case EVERGREEN: case CAYMAN: evergreen_init_state_functions(rctx); evergreen_init_atom_start_cs(rctx); - if (evergreen_context_init(rctx)) { - r600_destroy_context(&rctx->context); - return NULL; - } + if (evergreen_context_init(rctx)) + goto fail; rctx->custom_dsa_flush = evergreen_create_db_flush_dsa(rctx); break; default: R600_ERR("Unsupported chip class %d.\n", rctx->chip_class); - r600_destroy_context(&rctx->context); - return NULL; + goto fail; } rctx->cs = rctx->ws->cs_create(rctx->ws); @@ -306,21 +299,21 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void PIPE_BIND_INDEX_BUFFER | PIPE_BIND_CONSTANT_BUFFER, U_VERTEX_FETCH_DWORD_ALIGNED); - if (!rctx->vbuf_mgr) { - r600_destroy_context(&rctx->context); - return NULL; - } + if (!rctx->vbuf_mgr) + goto fail; rctx->vbuf_mgr->caps.format_fixed32 = 0; rctx->blitter = util_blitter_create(&rctx->context); - if (rctx->blitter == NULL) { - r600_destroy_context(&rctx->context); - return NULL; - } + if (rctx->blitter == NULL) + goto fail; r600_get_backend_mask(rctx); /* this emits commands and must be last */ return &rctx->context; + +fail: + r600_destroy_context(&rctx->context); + return NULL; } /* |