diff options
| author | Eric Anholt <eric@anholt.net> | 2007-12-17 14:42:21 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-12-17 14:42:31 -0800 |
| commit | 8336f3ffb7e4033337a1d0eafef43cbf3329f499 (patch) | |
| tree | c13bd2972d8f599328d02a6c8684287db06383e4 | |
| parent | 2c9e515d8607fb91f08c500a841cdf7f32bda346 (diff) | |
[965] fix bad conflict resolution in debug code.
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_dump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c b/src/mesa/drivers/dri/i965/brw_state_dump.c index 9bcbbefd16..9eb27cc267 100644 --- a/src/mesa/drivers/dri/i965/brw_state_dump.c +++ b/src/mesa/drivers/dri/i965/brw_state_dump.c @@ -99,7 +99,7 @@ static void dump_wm_surface_state(struct brw_context *brw) surf = (struct brw_surface_state *)(surf_bo->virtual); sprintf(name, "WM SS%d", i); - state_out(name, surf, surfoff, 0, "\n", + state_out(name, surf, surfoff, 0, "%s\n", get_965_surfacetype(surf->ss0.surface_type)); state_out(name, surf, surfoff, 1, "offset\n"); state_out(name, surf, surfoff, 2, "%dx%d size, %d mips\n", |