From ec995de6fbafe8d6018b91ca130abac760112475 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 3 Jul 2013 14:26:01 -0700 Subject: [PATCH] i965: Move intel_context::stats_wm to brw_context. Signed-off-by: Kenneth Graunke Acked-by: Chris Forbes Acked-by: Paul Berry Acked-by: Anuj Phogat --- src/mesa/drivers/dri/i965/brw_cc.c | 3 +-- src/mesa/drivers/dri/i965/brw_context.h | 2 ++ src/mesa/drivers/dri/i965/brw_queryobj.c | 4 ++-- src/mesa/drivers/dri/i965/brw_wm.c | 2 +- src/mesa/drivers/dri/i965/brw_wm_state.c | 2 +- src/mesa/drivers/dri/i965/intel_context.h | 2 -- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_cc.c b/src/mesa/drivers/dri/i965/brw_cc.c index f3e5b7cfb4a..0b849479d0c 100644 --- a/src/mesa/drivers/dri/i965/brw_cc.c +++ b/src/mesa/drivers/dri/i965/brw_cc.c @@ -96,7 +96,6 @@ brw_fix_xRGB_alpha(GLenum function) */ static void upload_cc_unit(struct brw_context *brw) { - struct intel_context *intel = &brw->intel; struct gl_context *ctx = &brw->intel.ctx; struct brw_cc_unit_state *cc; @@ -211,7 +210,7 @@ static void upload_cc_unit(struct brw_context *brw) cc->cc2.depth_write_enable = ctx->Depth.Mask; } - if (intel->stats_wm || unlikely(INTEL_DEBUG & DEBUG_STATS)) + if (brw->stats_wm || unlikely(INTEL_DEBUG & DEBUG_STATS)) cc->cc5.statistics_enable = 1; /* CACHE_NEW_CC_VP */ diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index fc3208ba026..6ca4b2eb314 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -833,6 +833,8 @@ struct brw_context */ bool is_front_buffer_reading; + GLuint stats_wm; + /** * drirc options: * @{ diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c index 66026885884..6b2f9888c25 100644 --- a/src/mesa/drivers/dri/i965/brw_queryobj.c +++ b/src/mesa/drivers/dri/i965/brw_queryobj.c @@ -296,7 +296,7 @@ brw_begin_query(struct gl_context *ctx, struct gl_query_object *q) * avoid them when necessary. They're required for occlusion queries, * so turn them on now. */ - intel->stats_wm++; + brw->stats_wm++; brw->state.dirty.brw |= BRW_NEW_STATS_WM; break; @@ -355,7 +355,7 @@ brw_end_query(struct gl_context *ctx, struct gl_query_object *q) brw->query.obj = NULL; - intel->stats_wm--; + brw->stats_wm--; brw->state.dirty.brw |= BRW_NEW_STATS_WM; break; diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 0eed5bd132c..b36ddbad4ea 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -420,7 +420,7 @@ static void brw_wm_populate_key( struct brw_context *brw, key->line_aa = line_aa; if (intel->gen < 6) - key->stats_wm = brw->intel.stats_wm; + key->stats_wm = brw->stats_wm; /* _NEW_LIGHT */ key->flat_shade = (ctx->Light.ShadeModel == GL_FLAT); diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index 63b8916deb5..79205a83740 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -204,7 +204,7 @@ brw_upload_wm_unit(struct brw_context *brw) wm->wm5.line_stipple = ctx->Line.StippleFlag; /* BRW_NEW_STATS_WM */ - if (unlikely(INTEL_DEBUG & DEBUG_STATS) || intel->stats_wm) + if (unlikely(INTEL_DEBUG & DEBUG_STATS) || brw->stats_wm) wm->wm4.stats_enable = 1; /* Emit scratch space relocation */ diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h index b1798cf3598..ae5ae5f8a75 100644 --- a/src/mesa/drivers/dri/i965/intel_context.h +++ b/src/mesa/drivers/dri/i965/intel_context.h @@ -150,8 +150,6 @@ struct intel_context uint32_t max_gtt_map_object_size; - GLuint stats_wm; - int driFd; __DRIcontext *driContext; -- 2.30.2