From ddc8decdb211f905bad5c903a38cd3cbbf62418d Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 27 Sep 2013 15:00:22 -0700 Subject: [PATCH] i965: Move DriverFlag initialization to brw_init_state(). Configuring which dirty flags we want sounds like a job for brw_init_state(). Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/brw_context.c | 4 ---- src/mesa/drivers/dri/i965/brw_state_upload.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index a283f5be66b..177bda009f9 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -603,10 +603,6 @@ brwCreateContext(gl_api api, brw_init_surface_formats(brw); - ctx->DriverFlags.NewTransformFeedback = BRW_NEW_TRANSFORM_FEEDBACK; - ctx->DriverFlags.NewRasterizerDiscard = BRW_NEW_RASTERIZER_DISCARD; - ctx->DriverFlags.NewUniformBuffer = BRW_NEW_UNIFORM_BUFFER; - if (brw->is_g4x || brw->gen >= 5) { brw->CMD_VF_STATISTICS = GM45_3DSTATE_VF_STATISTICS; brw->CMD_PIPELINE_SELECT = CMD_PIPELINE_SELECT_GM45; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 0aca7ddbbba..ec9bfb06175 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -263,6 +263,7 @@ brw_upload_initial_gpu_state(struct brw_context *brw) void brw_init_state( struct brw_context *brw ) { + struct gl_context *ctx = &brw->ctx; const struct brw_tracked_state **atoms; int num_atoms; @@ -299,6 +300,10 @@ void brw_init_state( struct brw_context *brw ) * dirty flags. */ STATIC_ASSERT(BRW_NUM_STATE_BITS <= 8 * sizeof(brw->state.dirty.brw)); + + ctx->DriverFlags.NewTransformFeedback = BRW_NEW_TRANSFORM_FEEDBACK; + ctx->DriverFlags.NewRasterizerDiscard = BRW_NEW_RASTERIZER_DISCARD; + ctx->DriverFlags.NewUniformBuffer = BRW_NEW_UNIFORM_BUFFER; } -- 2.30.2