From: Eric Anholt Date: Mon, 17 Dec 2007 22:42:21 +0000 (-0800) Subject: [965] fix bad conflict resolution in debug code. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8336f3ffb7e4033337a1d0eafef43cbf3329f499;p=mesa.git [965] fix bad conflict resolution in debug code. --- diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c b/src/mesa/drivers/dri/i965/brw_state_dump.c index 9bcbbefd168..9eb27cc2672 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",