AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r600g: don't initialize the screen and winsys pointer twice

Browse Source
This commit is contained in:
Marek Olšák
2012-01-29 23:35:10 +01:00
parent e4340c1908
commit bc70bcfc69
4 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r600/evergreen_hw_context.c
+2 -5
View File
@@ -908,13 +908,10 @@ static int evergreen_loop_const_init(struct r600_context *ctx, uint32_t offset)
return r600_context_add_block(ctx, r600_loop_consts, nreg, PKT3_SET_LOOP_CONST, EVERGREEN_LOOP_CONST_OFFSET);
}
int evergreen_context_init(struct r600_context *ctx, struct r600_screen *screen)
int evergreen_context_init(struct r600_context *ctx)
{
int r;
ctx->screen = screen;
ctx->ws = screen->ws;
LIST_INITHEAD(&ctx->active_query_list);
/* init dirty list */
@@ -998,7 +995,7 @@ int evergreen_context_init(struct r600_context *ctx, struct r600_screen *screen)
if (r)
goto out_err;
ctx->cs = screen->ws->cs_create(screen->ws);
ctx->cs = ctx->ws->cs_create(ctx->ws);
/* allocate cs variables */
ctx->bo = calloc(RADEON_MAX_CMDBUF_DWORDS, sizeof(void *));
src/gallium/drivers/r600/r600.h
+2 -2
View File
@@ -213,7 +213,7 @@ struct r600_context;
struct r600_screen;
void r600_get_backend_mask(struct r600_context *ctx);
int r600_context_init(struct r600_context *ctx, struct r600_screen *screen);
int r600_context_init(struct r600_context *ctx);
void r600_context_fini(struct r600_context *ctx);
void r600_context_pipe_state_set(struct r600_context *ctx, struct r600_pipe_state *state);
void r600_context_pipe_state_set_ps_resource(struct r600_context *ctx, struct r600_pipe_resource_state *state, unsigned rid);
@@ -244,7 +244,7 @@ void r600_context_streamout_begin(struct r600_context *ctx);
void r600_context_streamout_end(struct r600_context *ctx);
void r600_context_draw_opaque_count(struct r600_context *ctx, struct r600_so_target *t);
int evergreen_context_init(struct r600_context *ctx, struct r600_screen *screen);
int evergreen_context_init(struct r600_context *ctx);
void evergreen_context_draw(struct r600_context *ctx, const struct r600_draw *draw);
void evergreen_context_flush_dest_caches(struct r600_context *ctx);
void evergreen_context_pipe_state_set_ps_resource(struct r600_context *ctx, struct r600_pipe_resource_state *state, unsigned rid);
src/gallium/drivers/r600/r600_hw_context.c
+2 -5
View File
@@ -827,13 +827,10 @@ int r600_setup_block_table(struct r600_context *ctx)
return 0;
}
int r600_context_init(struct r600_context *ctx, struct r600_screen *screen)
int r600_context_init(struct r600_context *ctx)
{
int r;
ctx->screen = screen;
ctx->ws = screen->ws;
LIST_INITHEAD(&ctx->active_query_list);
/* init dirty list */
@@ -909,7 +906,7 @@ int r600_context_init(struct r600_context *ctx, struct r600_screen *screen)
if (r)
goto out_err;
ctx->cs = screen->ws->cs_create(screen->ws);
ctx->cs = ctx->ws->cs_create(ctx->ws);
/* allocate cs variables */
ctx->bo = calloc(RADEON_MAX_CMDBUF_DWORDS, sizeof(void *));
src/gallium/drivers/r600/r600_pipe.c
+2 -2
View File
@@ -236,7 +236,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
case R600:
case R700:
r600_init_state_functions(rctx);
if (r600_context_init(rctx, rctx->screen)) {
if (r600_context_init(rctx)) {
r600_destroy_context(&rctx->context);
return NULL;
}
@@ -246,7 +246,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
case EVERGREEN:
case CAYMAN:
evergreen_init_state_functions(rctx);
if (evergreen_context_init(rctx, rctx->screen)) {
if (evergreen_context_init(rctx)) {
r600_destroy_context(&rctx->context);
return NULL;
}