r600g,radeonsi: create aux_context last

This fixes a regression caused by 68f6dec32e.
This commit is contained in:
Marek Olšák 2013-10-03 16:39:50 +02:00
parent 52bfe8e0f6
commit b893bbf438
3 changed files with 6 additions and 2 deletions

View file

@ -1134,6 +1134,9 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
}
}
/* Create the auxiliary context. This must be done last. */
rscreen->b.aux_context = rscreen->b.b.context_create(&rscreen->b.b, NULL);
#if 0 /* This is for testing whether aux_context and buffer clearing work correctly. */
struct pipe_resource templ = {};

View file

@ -175,9 +175,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
util_format_s3tc_init();
/* Create the auxiliary context. */
pipe_mutex_init(rscreen->aux_context_lock);
rscreen->aux_context = rscreen->b.context_create(&rscreen->b, NULL);
return true;
}

View file

@ -819,5 +819,8 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
}
#endif
/* Create the auxiliary context. This must be done last. */
rscreen->b.aux_context = rscreen->b.b.context_create(&rscreen->b.b, NULL);
return &rscreen->b.b;
}