summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2013-10-25 22:44:19 -0700
committerKenneth Graunke <kenneth@whitecape.org>2013-10-31 11:04:37 -0700
commit46d3c2bf4ddd227193b98861f1e632498fe547d8 (patch)
tree2755c4de315566627a9e83191748ead9b7aa17db /src
parent82a5ee6be4b4f5881d86f18d4b002d23c9e18ea5 (diff)
i965: Initialize batchbuffer and state modules before extensions.
We only want to enable ARB_transform_feedback2 if we can write to registers from batchbuffers. In order to test that, we need to be able to submit batches. And for batches to work, we need to program the initial pipeline state (like PIPELINE_SELECT), which is done from brw_state_init(). Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index f4e04b69d47..38147e9fe48 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -609,10 +609,12 @@ brwCreateContext(gl_api api,
/* Reinitialize the context point state. It depends on ctx->Const values. */
_mesa_init_point(ctx);
- intelInitExtensions(ctx);
-
intel_batchbuffer_init(brw);
+ brw_init_state(brw);
+
+ intelInitExtensions(ctx);
+
intel_fbo_init(brw);
if (brw->gen >= 6) {
@@ -671,8 +673,6 @@ brwCreateContext(gl_api api,
brw->prim_restart.in_progress = false;
brw->prim_restart.enable_cut_index = false;
- brw_init_state( brw );
-
if (brw->gen < 6) {
brw->curbe.last_buf = calloc(1, 4096);
brw->curbe.next_buf = calloc(1, 4096);