summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeonsi/si_pipe.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2014-01-21 18:01:01 +0100
committerMarek Olšák <[email protected]>2014-01-28 01:38:56 +0100
commit4e5c70e066b0fa28a6e40791963604286929a412 (patch)
tree8288a21b8309ef38b3909fa93a24c14e0e3f4d56 /src/gallium/drivers/radeonsi/si_pipe.c
parentf5bd5568abcc234c1c2b6a4bb67b880706f3caed (diff)
r600g: move queries to drivers/radeon
Reviewed-by: Michel Dänzer <[email protected]> Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_pipe.c')
-rw-r--r--src/gallium/drivers/radeonsi/si_pipe.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index d76f3835084..662c5211f36 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -132,16 +132,14 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
if (sctx == NULL)
return NULL;
- if (!r600_common_context_init(&sctx->b, &sscreen->b))
- goto fail;
-
- sctx->b.b.screen = screen;
+ sctx->b.b.screen = screen; /* this must be set first */
sctx->b.b.priv = priv;
sctx->b.b.destroy = si_destroy_context;
sctx->b.b.flush = si_flush_from_st;
+ sctx->screen = sscreen; /* Easy accessing of screen/winsys. */
- /* Easy accessing of screen/winsys. */
- sctx->screen = sscreen;
+ if (!r600_common_context_init(&sctx->b, &sscreen->b))
+ goto fail;
si_init_blit_functions(sctx);
si_init_query_functions(sctx);