fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 06:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Move the new gen6 state structs to using state_batch_list[].

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2011-06-22 16:03:05 -07:00
parent fbfeff73f3
commit 00f07b33ec
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/mesa/drivers/dri/i965/brw_state_dump.c
View file

@ -371,7 +371,7 @@ static void dump_sf_clip_viewport_state(struct brw_context *brw,
} }
static void dump_cc_viewport_state(struct brw_context *brw) static void dump_cc_viewport_state(struct brw_context *brw, uint32_t offset)
{ {
struct intel_context *intel = &brw->intel; struct intel_context *intel = &brw->intel;
const char *name = "CC VP"; const char *name = "CC VP";
@ -380,15 +380,15 @@ static void dump_cc_viewport_state(struct brw_context *brw)
drm_intel_bo_map(intel->batch.bo, GL_FALSE); drm_intel_bo_map(intel->batch.bo, GL_FALSE);
vp = intel->batch.bo->virtual + brw->cc.vp_offset; vp = intel->batch.bo->virtual + offset;
vp_off = intel->batch.bo->offset + brw->cc.vp_offset; vp_off = intel->batch.bo->offset + offset;
state_out(name, vp, vp_off, 0, "min_depth = %f\n", vp->min_depth); state_out(name, vp, vp_off, 0, "min_depth = %f\n", vp->min_depth);
state_out(name, vp, vp_off, 1, "max_depth = %f\n", vp->max_depth); state_out(name, vp, vp_off, 1, "max_depth = %f\n", vp->max_depth);
drm_intel_bo_unmap(intel->batch.bo); drm_intel_bo_unmap(intel->batch.bo);
} }
static void dump_depth_stencil_state(struct brw_context *brw) static void dump_depth_stencil_state(struct brw_context *brw, uint32_t offset)
{ {
struct intel_context *intel = &brw->intel; struct intel_context *intel = &brw->intel;
const char *name = "DEPTH STENCIL"; const char *name = "DEPTH STENCIL";
@ -397,8 +397,8 @@ static void dump_depth_stencil_state(struct brw_context *brw)
drm_intel_bo_map(intel->batch.bo, GL_FALSE); drm_intel_bo_map(intel->batch.bo, GL_FALSE);
ds = intel->batch.bo->virtual + brw->cc.depth_stencil_state_offset; ds = intel->batch.bo->virtual + offset;
ds_off = intel->batch.bo->offset + brw->cc.depth_stencil_state_offset; ds_off = intel->batch.bo->offset + offset;
state_out(name, ds, ds_off, 0, "stencil %sable, func %d, write %sable\n", state_out(name, ds, ds_off, 0, "stencil %sable, func %d, write %sable\n",
ds->ds0.stencil_enable ? "en" : "dis", ds->ds0.stencil_enable ? "en" : "dis",
@ -413,19 +413,16 @@ static void dump_depth_stencil_state(struct brw_context *brw)
drm_intel_bo_unmap(intel->batch.bo); drm_intel_bo_unmap(intel->batch.bo);
} }
static void dump_cc_state(struct brw_context *brw) static void dump_cc_state(struct brw_context *brw, uint32_t offset)
{ {
const char *name = "CC"; const char *name = "CC";
struct gen6_color_calc_state *cc; struct gen6_color_calc_state *cc;
uint32_t cc_off; uint32_t cc_off;
dri_bo *bo = brw->intel.batch.bo; dri_bo *bo = brw->intel.batch.bo;
if (brw->cc.state_offset == 0)
return;
drm_intel_bo_map(bo, GL_FALSE); drm_intel_bo_map(bo, GL_FALSE);
cc = bo->virtual + brw->cc.state_offset; cc = bo->virtual + offset;
cc_off = bo->offset + brw->cc.state_offset; cc_off = bo->offset + offset;
state_out(name, cc, cc_off, 0, "alpha test format %s, round disable %d, stencil ref %d," state_out(name, cc, cc_off, 0, "alpha test format %s, round disable %d, stencil ref %d,"
"bf stencil ref %d\n", "bf stencil ref %d\n",
@ -443,7 +440,7 @@ static void dump_cc_state(struct brw_context *brw)
} }
static void dump_blend_state(struct brw_context *brw) static void dump_blend_state(struct brw_context *brw, uint32_t offset)
{ {
struct intel_context *intel = &brw->intel; struct intel_context *intel = &brw->intel;
const char *name = "BLEND"; const char *name = "BLEND";
@ -452,8 +449,8 @@ static void dump_blend_state(struct brw_context *brw)
drm_intel_bo_map(intel->batch.bo, GL_FALSE); drm_intel_bo_map(intel->batch.bo, GL_FALSE);
blend = intel->batch.bo->virtual + brw->cc.blend_state_offset; blend = intel->batch.bo->virtual + offset;
blend_off = intel->batch.bo->offset + brw->cc.blend_state_offset; blend_off = intel->batch.bo->offset + offset;
state_out(name, blend, blend_off, 0, "\n"); state_out(name, blend, blend_off, 0, "\n");
state_out(name, blend, blend_off, 1, "\n"); state_out(name, blend, blend_off, 1, "\n");
@ -509,6 +506,18 @@ dump_state_batch(struct brw_context *brw)
dump_sf_viewport_state(brw, offset); dump_sf_viewport_state(brw, offset);
} }
break; break;
case AUB_TRACE_CC_VP_STATE:
dump_cc_viewport_state(brw, offset);
break;
case AUB_TRACE_DEPTH_STENCIL_STATE:
dump_depth_stencil_state(brw, offset);
break;
case AUB_TRACE_CC_STATE:
dump_cc_state(brw, offset);
break;
case AUB_TRACE_BLEND_STATE:
dump_blend_state(brw, offset);
break;
default: default:
break; break;
} }
@ -564,12 +573,5 @@ void brw_debug_batch(struct intel_context *intel)
sizeof(struct brw_wm_unit_state)); sizeof(struct brw_wm_unit_state));
brw_debug_prog(brw, "WM prog", brw->wm.prog_offset); brw_debug_prog(brw, "WM prog", brw->wm.prog_offset);
if (intel->gen >= 6) {
dump_cc_viewport_state(brw);
dump_depth_stencil_state(brw);
dump_cc_state(brw);
dump_blend_state(brw);
}
dump_state_batch(brw); dump_state_batch(brw);
} }