diff options
| author | Kenneth Graunke <[email protected]> | 2013-09-26 12:06:32 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-10-13 00:10:44 -0700 |
| commit | 220c1e5610faf228e342153e544a3ce9040301a1 (patch) | |
| tree | d5370648c804cf3b0669628af854415045eb33cc | |
| parent | d31b928b93694de0a1408f36acb675485fea5973 (diff) | |
i965: Move state setup from brwCreateContext to brw_init_state().
This seems like a better place for it, and helps clean up
brwCreateContext (which is full of a lot of random stuff).
Signed-off-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 3ddc1814e3b..d6d40ad8b19 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -467,14 +467,6 @@ brwCreateContext(gl_api api, brw->curbe.next_buf = calloc(1, 4096); } - brw->state.dirty.mesa = ~0; - brw->state.dirty.brw = ~0; - - /* Make sure that brw->state.dirty.brw has enough bits to hold all possible - * dirty flags. - */ - STATIC_ASSERT(BRW_NUM_STATE_BITS <= 8 * sizeof(brw->state.dirty.brw)); - brw->batch.need_workaround_flush = true; ctx->VertexProgram._MaintainTnlProgram = true; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 60c8b5e2b87..0aca7ddbbba 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -291,6 +291,14 @@ void brw_init_state( struct brw_context *brw ) } brw_upload_initial_gpu_state(brw); + + brw->state.dirty.mesa = ~0; + brw->state.dirty.brw = ~0; + + /* Make sure that brw->state.dirty.brw has enough bits to hold all possible + * dirty flags. + */ + STATIC_ASSERT(BRW_NUM_STATE_BITS <= 8 * sizeof(brw->state.dirty.brw)); } |