summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-10-28 22:31:34 +0200
committerMarek Olšák <[email protected]>2011-10-28 22:55:01 +0200
commitbbad5103e61806ef6d6a0d5e53abc4b9e77a7fe9 (patch)
tree79f7ac9b9404769749ff93f39423bad262cf988e
parent276000472abbc34d86fcb628bc3a1990e9581af3 (diff)
r600g: get backend mask after the context is fully set up
-rw-r--r--src/gallium/drivers/r600/evergreen_hw_context.c2
-rw-r--r--src/gallium/drivers/r600/r600_hw_context.c2
-rw-r--r--src/gallium/drivers/r600/r600_pipe.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index 72ec5630b9a..f9b8ec28c85 100644
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -1003,8 +1003,6 @@ int evergreen_context_init(struct r600_context *ctx, struct r600_screen *screen)
/* save 16dwords space for fence mecanism */
ctx->pm4_ndwords -= 16;
ctx->max_db = 8;
-
- r600_get_backend_mask(ctx);
return 0;
out_err:
r600_context_fini(ctx);
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index a7d7ce68bb5..ca245f01002 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -922,8 +922,6 @@ int r600_context_init(struct r600_context *ctx, struct r600_screen *screen)
/* save 16dwords space for fence mecanism */
ctx->pm4_ndwords -= 16;
ctx->max_db = 4;
-
- r600_get_backend_mask(ctx);
return 0;
out_err:
r600_context_fini(ctx);
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index d0a86ded83c..00c28341835 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -281,6 +281,8 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
return NULL;
}
+ r600_get_backend_mask(&rctx->ctx); /* this emits commands and must be last */
+
return &rctx->context;
}