AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Move intel_context::stats_wm to brw_context.

Browse Source 
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Kenneth Graunke
2013-07-03 14:26:01 -07:00
parent 329779a0b4
commit ec995de6fb
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_cc.c
+1 -2
View File
@@ -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 */
src/mesa/drivers/dri/i965/brw_context.h
+2
View File
@@ -833,6 +833,8 @@ struct brw_context
*/
bool is_front_buffer_reading;
GLuint stats_wm;
/**
* drirc options:
* @{
src/mesa/drivers/dri/i965/brw_queryobj.c
+2 -2
View File
@@ -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;
src/mesa/drivers/dri/i965/brw_wm.c
+1 -1
View File
@@ -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);
src/mesa/drivers/dri/i965/brw_wm_state.c
+1 -1
View File
@@ -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 */
src/mesa/drivers/dri/i965/intel_context.h
-2
View File
@@ -150,8 +150,6 @@ struct intel_context
uint32_t max_gtt_map_object_size;
GLuint stats_wm;
int driFd;
__DRIcontext *driContext;