i965g: Don't dump pads or dwords aliases.

2 files changed, 8 insertions, 265 deletions

diff --git a/src/gallium/drivers/i965/brw_structs_dump.c b/src/gallium/drivers/i965/brw_structs_dump.c
index a8b96c6418..cd40fc6d61 100644
--- a/src/gallium/drivers/i965/brw_structs_dump.c
+++ b/src/gallium/drivers/i965/brw_structs_dump.c
@@ -43,12 +43,10 @@ brw_dump_3d_control(const struct brw_3d_control *ptr)
 {
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.notify_enable = 0x%x\n", (*ptr).header.notify_enable);
-   debug_printf("\t\t.header.pad = 0x%x\n", (*ptr).header.pad);
    debug_printf("\t\t.header.wc_flush_enable = 0x%x\n", (*ptr).header.wc_flush_enable);
    debug_printf("\t\t.header.depth_stall_enable = 0x%x\n", (*ptr).header.depth_stall_enable);
    debug_printf("\t\t.header.operation = 0x%x\n", (*ptr).header.operation);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
-   debug_printf("\t\t.dest.pad = 0x%x\n", (*ptr).dest.pad);
    debug_printf("\t\t.dest.dest_addr_type = 0x%x\n", (*ptr).dest.dest_addr_type);
    debug_printf("\t\t.dest.dest_addr = 0x%x\n", (*ptr).dest.dest_addr);
    debug_printf("\t\t.dword2 = 0x%x\n", (*ptr).dword2);
@@ -59,7 +57,6 @@ void
 brw_dump_3d_primitive(const struct brw_3d_primitive *ptr)
 {
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
-   debug_printf("\t\t.header.pad = 0x%x\n", (*ptr).header.pad);
    debug_printf("\t\t.header.topology = 0x%x\n", (*ptr).header.topology);
    debug_printf("\t\t.header.indexed = 0x%x\n", (*ptr).header.indexed);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
@@ -76,13 +73,9 @@ brw_dump_aa_line_parameters(const struct brw_aa_line_parameters *ptr)
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.bits0.aa_coverage_scope = 0x%x\n", (*ptr).bits0.aa_coverage_scope);
-   debug_printf("\t\t.bits0.pad0 = 0x%x\n", (*ptr).bits0.pad0);
    debug_printf("\t\t.bits0.aa_coverage_bias = 0x%x\n", (*ptr).bits0.aa_coverage_bias);
-   debug_printf("\t\t.bits0.pad1 = 0x%x\n", (*ptr).bits0.pad1);
    debug_printf("\t\t.bits1.aa_coverage_endcap_slope = 0x%x\n", (*ptr).bits1.aa_coverage_endcap_slope);
-   debug_printf("\t\t.bits1.pad0 = 0x%x\n", (*ptr).bits1.pad0);
    debug_printf("\t\t.bits1.aa_coverage_endcap_bias = 0x%x\n", (*ptr).bits1.aa_coverage_endcap_bias);
-   debug_printf("\t\t.bits1.pad1 = 0x%x\n", (*ptr).bits1.pad1);
 }
 
 void
@@ -111,13 +104,11 @@ brw_dump_blend_constant_color(const struct brw_blend_constant_color *ptr)
 void
 brw_dump_cc0(const struct brw_cc0 *ptr)
 {
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.bf_stencil_pass_depth_pass_op = 0x%x\n", (*ptr).bf_stencil_pass_depth_pass_op);
    debug_printf("\t\t.bf_stencil_pass_depth_fail_op = 0x%x\n", (*ptr).bf_stencil_pass_depth_fail_op);
    debug_printf("\t\t.bf_stencil_fail_op = 0x%x\n", (*ptr).bf_stencil_fail_op);
    debug_printf("\t\t.bf_stencil_func = 0x%x\n", (*ptr).bf_stencil_func);
    debug_printf("\t\t.bf_stencil_enable = 0x%x\n", (*ptr).bf_stencil_enable);
-   debug_printf("\t\t.pad1 = 0x%x\n", (*ptr).pad1);
    debug_printf("\t\t.stencil_write_enable = 0x%x\n", (*ptr).stencil_write_enable);
    debug_printf("\t\t.stencil_pass_depth_pass_op = 0x%x\n", (*ptr).stencil_pass_depth_pass_op);
    debug_printf("\t\t.stencil_pass_depth_fail_op = 0x%x\n", (*ptr).stencil_pass_depth_fail_op);
@@ -139,7 +130,6 @@ void
 brw_dump_cc2(const struct brw_cc2 *ptr)
 {
    debug_printf("\t\t.logicop_enable = 0x%x\n", (*ptr).logicop_enable);
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.depth_write_enable = 0x%x\n", (*ptr).depth_write_enable);
    debug_printf("\t\t.depth_test_function = 0x%x\n", (*ptr).depth_test_function);
    debug_printf("\t\t.depth_test = 0x%x\n", (*ptr).depth_test);
@@ -150,33 +140,27 @@ brw_dump_cc2(const struct brw_cc2 *ptr)
 void
 brw_dump_cc3(const struct brw_cc3 *ptr)
 {
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.alpha_test_func = 0x%x\n", (*ptr).alpha_test_func);
    debug_printf("\t\t.alpha_test = 0x%x\n", (*ptr).alpha_test);
    debug_printf("\t\t.blend_enable = 0x%x\n", (*ptr).blend_enable);
    debug_printf("\t\t.ia_blend_enable = 0x%x\n", (*ptr).ia_blend_enable);
-   debug_printf("\t\t.pad1 = 0x%x\n", (*ptr).pad1);
    debug_printf("\t\t.alpha_test_format = 0x%x\n", (*ptr).alpha_test_format);
-   debug_printf("\t\t.pad2 = 0x%x\n", (*ptr).pad2);
 }
 
 void
 brw_dump_cc4(const struct brw_cc4 *ptr)
 {
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.cc_viewport_state_offset = 0x%x\n", (*ptr).cc_viewport_state_offset);
 }
 
 void
 brw_dump_cc5(const struct brw_cc5 *ptr)
 {
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.ia_dest_blend_factor = 0x%x\n", (*ptr).ia_dest_blend_factor);
    debug_printf("\t\t.ia_src_blend_factor = 0x%x\n", (*ptr).ia_src_blend_factor);
    debug_printf("\t\t.ia_blend_function = 0x%x\n", (*ptr).ia_blend_function);
    debug_printf("\t\t.statistics_enable = 0x%x\n", (*ptr).statistics_enable);
    debug_printf("\t\t.logicop_func = 0x%x\n", (*ptr).logicop_func);
-   debug_printf("\t\t.pad1 = 0x%x\n", (*ptr).pad1);
    debug_printf("\t\t.dither_enable = 0x%x\n", (*ptr).dither_enable);
 }
 
@@ -186,7 +170,6 @@ brw_dump_cc6(const struct brw_cc6 *ptr)
    debug_printf("\t\t.clamp_post_alpha_blend = 0x%x\n", (*ptr).clamp_post_alpha_blend);
    debug_printf("\t\t.clamp_pre_alpha_blend = 0x%x\n", (*ptr).clamp_pre_alpha_blend);
    debug_printf("\t\t.clamp_range = 0x%x\n", (*ptr).clamp_range);
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.y_dither_offset = 0x%x\n", (*ptr).y_dither_offset);
    debug_printf("\t\t.x_dither_offset = 0x%x\n", (*ptr).x_dither_offset);
    debug_printf("\t\t.dest_blend_factor = 0x%x\n", (*ptr).dest_blend_factor);
@@ -207,13 +190,11 @@ brw_dump_cc7(const struct brw_cc7 *ptr)
 void
 brw_dump_cc_unit_state(const struct brw_cc_unit_state *ptr)
 {
-   debug_printf("\t\t.cc0.pad0 = 0x%x\n", (*ptr).cc0.pad0);
    debug_printf("\t\t.cc0.bf_stencil_pass_depth_pass_op = 0x%x\n", (*ptr).cc0.bf_stencil_pass_depth_pass_op);
    debug_printf("\t\t.cc0.bf_stencil_pass_depth_fail_op = 0x%x\n", (*ptr).cc0.bf_stencil_pass_depth_fail_op);
    debug_printf("\t\t.cc0.bf_stencil_fail_op = 0x%x\n", (*ptr).cc0.bf_stencil_fail_op);
    debug_printf("\t\t.cc0.bf_stencil_func = 0x%x\n", (*ptr).cc0.bf_stencil_func);
    debug_printf("\t\t.cc0.bf_stencil_enable = 0x%x\n", (*ptr).cc0.bf_stencil_enable);
-   debug_printf("\t\t.cc0.pad1 = 0x%x\n", (*ptr).cc0.pad1);
    debug_printf("\t\t.cc0.stencil_write_enable = 0x%x\n", (*ptr).cc0.stencil_write_enable);
    debug_printf("\t\t.cc0.stencil_pass_depth_pass_op = 0x%x\n", (*ptr).cc0.stencil_pass_depth_pass_op);
    debug_printf("\t\t.cc0.stencil_pass_depth_fail_op = 0x%x\n", (*ptr).cc0.stencil_pass_depth_fail_op);
@@ -225,34 +206,26 @@ brw_dump_cc_unit_state(const struct brw_cc_unit_state *ptr)
    debug_printf("\t\t.cc1.stencil_test_mask = 0x%x\n", (*ptr).cc1.stencil_test_mask);
    debug_printf("\t\t.cc1.stencil_ref = 0x%x\n", (*ptr).cc1.stencil_ref);
    debug_printf("\t\t.cc2.logicop_enable = 0x%x\n", (*ptr).cc2.logicop_enable);
-   debug_printf("\t\t.cc2.pad0 = 0x%x\n", (*ptr).cc2.pad0);
    debug_printf("\t\t.cc2.depth_write_enable = 0x%x\n", (*ptr).cc2.depth_write_enable);
    debug_printf("\t\t.cc2.depth_test_function = 0x%x\n", (*ptr).cc2.depth_test_function);
    debug_printf("\t\t.cc2.depth_test = 0x%x\n", (*ptr).cc2.depth_test);
    debug_printf("\t\t.cc2.bf_stencil_write_mask = 0x%x\n", (*ptr).cc2.bf_stencil_write_mask);
    debug_printf("\t\t.cc2.bf_stencil_test_mask = 0x%x\n", (*ptr).cc2.bf_stencil_test_mask);
-   debug_printf("\t\t.cc3.pad0 = 0x%x\n", (*ptr).cc3.pad0);
    debug_printf("\t\t.cc3.alpha_test_func = 0x%x\n", (*ptr).cc3.alpha_test_func);
    debug_printf("\t\t.cc3.alpha_test = 0x%x\n", (*ptr).cc3.alpha_test);
    debug_printf("\t\t.cc3.blend_enable = 0x%x\n", (*ptr).cc3.blend_enable);
    debug_printf("\t\t.cc3.ia_blend_enable = 0x%x\n", (*ptr).cc3.ia_blend_enable);
-   debug_printf("\t\t.cc3.pad1 = 0x%x\n", (*ptr).cc3.pad1);
    debug_printf("\t\t.cc3.alpha_test_format = 0x%x\n", (*ptr).cc3.alpha_test_format);
-   debug_printf("\t\t.cc3.pad2 = 0x%x\n", (*ptr).cc3.pad2);
-   debug_printf("\t\t.cc4.pad0 = 0x%x\n", (*ptr).cc4.pad0);
    debug_printf("\t\t.cc4.cc_viewport_state_offset = 0x%x\n", (*ptr).cc4.cc_viewport_state_offset);
-   debug_printf("\t\t.cc5.pad0 = 0x%x\n", (*ptr).cc5.pad0);
    debug_printf("\t\t.cc5.ia_dest_blend_factor = 0x%x\n", (*ptr).cc5.ia_dest_blend_factor);
    debug_printf("\t\t.cc5.ia_src_blend_factor = 0x%x\n", (*ptr).cc5.ia_src_blend_factor);
    debug_printf("\t\t.cc5.ia_blend_function = 0x%x\n", (*ptr).cc5.ia_blend_function);
    debug_printf("\t\t.cc5.statistics_enable = 0x%x\n", (*ptr).cc5.statistics_enable);
    debug_printf("\t\t.cc5.logicop_func = 0x%x\n", (*ptr).cc5.logicop_func);
-   debug_printf("\t\t.cc5.pad1 = 0x%x\n", (*ptr).cc5.pad1);
    debug_printf("\t\t.cc5.dither_enable = 0x%x\n", (*ptr).cc5.dither_enable);
    debug_printf("\t\t.cc6.clamp_post_alpha_blend = 0x%x\n", (*ptr).cc6.clamp_post_alpha_blend);
    debug_printf("\t\t.cc6.clamp_pre_alpha_blend = 0x%x\n", (*ptr).cc6.clamp_pre_alpha_blend);
    debug_printf("\t\t.cc6.clamp_range = 0x%x\n", (*ptr).cc6.clamp_range);
-   debug_printf("\t\t.cc6.pad0 = 0x%x\n", (*ptr).cc6.pad0);
    debug_printf("\t\t.cc6.y_dither_offset = 0x%x\n", (*ptr).cc6.y_dither_offset);
    debug_printf("\t\t.cc6.x_dither_offset = 0x%x\n", (*ptr).cc6.x_dither_offset);
    debug_printf("\t\t.cc6.dest_blend_factor = 0x%x\n", (*ptr).cc6.dest_blend_factor);
@@ -275,44 +248,27 @@ brw_dump_cc_viewport(const struct brw_cc_viewport *ptr)
 void
 brw_dump_clip_unit_state(const struct brw_clip_unit_state *ptr)
 {
-   debug_printf("\t\t.thread0.pad0 = 0x%x\n", (*ptr).thread0.pad0);
    debug_printf("\t\t.thread0.grf_reg_count = 0x%x\n", (*ptr).thread0.grf_reg_count);
-   debug_printf("\t\t.thread0.pad1 = 0x%x\n", (*ptr).thread0.pad1);
    debug_printf("\t\t.thread0.kernel_start_pointer = 0x%x\n", (*ptr).thread0.kernel_start_pointer);
-   debug_printf("\t\t.thread1.pad0 = 0x%x\n", (*ptr).thread1.pad0);
    debug_printf("\t\t.thread1.sw_exception_enable = 0x%x\n", (*ptr).thread1.sw_exception_enable);
-   debug_printf("\t\t.thread1.pad1 = 0x%x\n", (*ptr).thread1.pad1);
    debug_printf("\t\t.thread1.mask_stack_exception_enable = 0x%x\n", (*ptr).thread1.mask_stack_exception_enable);
-   debug_printf("\t\t.thread1.pad2 = 0x%x\n", (*ptr).thread1.pad2);
    debug_printf("\t\t.thread1.illegal_op_exception_enable = 0x%x\n", (*ptr).thread1.illegal_op_exception_enable);
-   debug_printf("\t\t.thread1.pad3 = 0x%x\n", (*ptr).thread1.pad3);
    debug_printf("\t\t.thread1.floating_point_mode = 0x%x\n", (*ptr).thread1.floating_point_mode);
    debug_printf("\t\t.thread1.thread_priority = 0x%x\n", (*ptr).thread1.thread_priority);
    debug_printf("\t\t.thread1.binding_table_entry_count = 0x%x\n", (*ptr).thread1.binding_table_entry_count);
-   debug_printf("\t\t.thread1.pad4 = 0x%x\n", (*ptr).thread1.pad4);
    debug_printf("\t\t.thread1.single_program_flow = 0x%x\n", (*ptr).thread1.single_program_flow);
    debug_printf("\t\t.thread2.per_thread_scratch_space = 0x%x\n", (*ptr).thread2.per_thread_scratch_space);
-   debug_printf("\t\t.thread2.pad0 = 0x%x\n", (*ptr).thread2.pad0);
    debug_printf("\t\t.thread2.scratch_space_base_pointer = 0x%x\n", (*ptr).thread2.scratch_space_base_pointer);
    debug_printf("\t\t.thread3.dispatch_grf_start_reg = 0x%x\n", (*ptr).thread3.dispatch_grf_start_reg);
    debug_printf("\t\t.thread3.urb_entry_read_offset = 0x%x\n", (*ptr).thread3.urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad0 = 0x%x\n", (*ptr).thread3.pad0);
    debug_printf("\t\t.thread3.urb_entry_read_length = 0x%x\n", (*ptr).thread3.urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad1 = 0x%x\n", (*ptr).thread3.pad1);
    debug_printf("\t\t.thread3.const_urb_entry_read_offset = 0x%x\n", (*ptr).thread3.const_urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad2 = 0x%x\n", (*ptr).thread3.pad2);
    debug_printf("\t\t.thread3.const_urb_entry_read_length = 0x%x\n", (*ptr).thread3.const_urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad3 = 0x%x\n", (*ptr).thread3.pad3);
-   debug_printf("\t\t.thread4.pad0 = 0x%x\n", (*ptr).thread4.pad0);
    debug_printf("\t\t.thread4.gs_output_stats = 0x%x\n", (*ptr).thread4.gs_output_stats);
    debug_printf("\t\t.thread4.stats_enable = 0x%x\n", (*ptr).thread4.stats_enable);
    debug_printf("\t\t.thread4.nr_urb_entries = 0x%x\n", (*ptr).thread4.nr_urb_entries);
-   debug_printf("\t\t.thread4.pad1 = 0x%x\n", (*ptr).thread4.pad1);
    debug_printf("\t\t.thread4.urb_entry_allocation_size = 0x%x\n", (*ptr).thread4.urb_entry_allocation_size);
-   debug_printf("\t\t.thread4.pad2 = 0x%x\n", (*ptr).thread4.pad2);
    debug_printf("\t\t.thread4.max_threads = 0x%x\n", (*ptr).thread4.max_threads);
-   debug_printf("\t\t.thread4.pad3 = 0x%x\n", (*ptr).thread4.pad3);
-   debug_printf("\t\t.clip5.pad0 = 0x%x\n", (*ptr).clip5.pad0);
    debug_printf("\t\t.clip5.clip_mode = 0x%x\n", (*ptr).clip5.clip_mode);
    debug_printf("\t\t.clip5.userclip_enable_flags = 0x%x\n", (*ptr).clip5.userclip_enable_flags);
    debug_printf("\t\t.clip5.userclip_must_clip = 0x%x\n", (*ptr).clip5.userclip_must_clip);
@@ -322,8 +278,6 @@ brw_dump_clip_unit_state(const struct brw_clip_unit_state *ptr)
    debug_printf("\t\t.clip5.viewport_xy_clip_enable = 0x%x\n", (*ptr).clip5.viewport_xy_clip_enable);
    debug_printf("\t\t.clip5.vertex_position_space = 0x%x\n", (*ptr).clip5.vertex_position_space);
    debug_printf("\t\t.clip5.api_mode = 0x%x\n", (*ptr).clip5.api_mode);
-   debug_printf("\t\t.clip5.pad2 = 0x%x\n", (*ptr).clip5.pad2);
-   debug_printf("\t\t.clip6.pad0 = 0x%x\n", (*ptr).clip6.pad0);
    debug_printf("\t\t.clip6.clipper_viewport_state_ptr = 0x%x\n", (*ptr).clip6.clipper_viewport_state_ptr);
    debug_printf("\t\t.viewport_xmin = %f\n", (*ptr).viewport_xmin);
    debug_printf("\t\t.viewport_xmax = %f\n", (*ptr).viewport_xmax);
@@ -345,7 +299,6 @@ brw_dump_constant_buffer(const struct brw_constant_buffer *ptr)
 {
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.valid = 0x%x\n", (*ptr).header.valid);
-   debug_printf("\t\t.header.pad = 0x%x\n", (*ptr).header.pad);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.bits0.buffer_length = 0x%x\n", (*ptr).bits0.buffer_length);
    debug_printf("\t\t.bits0.buffer_address = 0x%x\n", (*ptr).bits0.buffer_address);
@@ -357,9 +310,7 @@ brw_dump_cs_urb_state(const struct brw_cs_urb_state *ptr)
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.bits0.nr_urb_entries = 0x%x\n", (*ptr).bits0.nr_urb_entries);
-   debug_printf("\t\t.bits0.pad = 0x%x\n", (*ptr).bits0.pad);
    debug_printf("\t\t.bits0.urb_entry_size = 0x%x\n", (*ptr).bits0.urb_entry_size);
-   debug_printf("\t\t.bits0.pad0 = 0x%x\n", (*ptr).bits0.pad0);
 }
 
 void
@@ -367,28 +318,20 @@ brw_dump_depthbuffer(const struct brw_depthbuffer *ptr)
 {
    debug_printf("\t\t.header.bits.length = 0x%x\n", (*ptr).header.bits.length);
    debug_printf("\t\t.header.bits.opcode = 0x%x\n", (*ptr).header.bits.opcode);
-   debug_printf("\t\t.header.dword = 0x%x\n", (*ptr).header.dword);
    debug_printf("\t\t.dword1.bits.pitch = 0x%x\n", (*ptr).dword1.bits.pitch);
    debug_printf("\t\t.dword1.bits.format = 0x%x\n", (*ptr).dword1.bits.format);
-   debug_printf("\t\t.dword1.bits.pad = 0x%x\n", (*ptr).dword1.bits.pad);
    debug_printf("\t\t.dword1.bits.software_tiled_rendering_mode = 0x%x\n", (*ptr).dword1.bits.software_tiled_rendering_mode);
    debug_printf("\t\t.dword1.bits.depth_offset_disable = 0x%x\n", (*ptr).dword1.bits.depth_offset_disable);
    debug_printf("\t\t.dword1.bits.tile_walk = 0x%x\n", (*ptr).dword1.bits.tile_walk);
    debug_printf("\t\t.dword1.bits.tiled_surface = 0x%x\n", (*ptr).dword1.bits.tiled_surface);
-   debug_printf("\t\t.dword1.bits.pad2 = 0x%x\n", (*ptr).dword1.bits.pad2);
    debug_printf("\t\t.dword1.bits.surface_type = 0x%x\n", (*ptr).dword1.bits.surface_type);
-   debug_printf("\t\t.dword1.dword = 0x%x\n", (*ptr).dword1.dword);
    debug_printf("\t\t.dword2_base_addr = 0x%x\n", (*ptr).dword2_base_addr);
-   debug_printf("\t\t.dword3.bits.pad = 0x%x\n", (*ptr).dword3.bits.pad);
    debug_printf("\t\t.dword3.bits.mipmap_layout = 0x%x\n", (*ptr).dword3.bits.mipmap_layout);
    debug_printf("\t\t.dword3.bits.lod = 0x%x\n", (*ptr).dword3.bits.lod);
    debug_printf("\t\t.dword3.bits.width = 0x%x\n", (*ptr).dword3.bits.width);
    debug_printf("\t\t.dword3.bits.height = 0x%x\n", (*ptr).dword3.bits.height);
-   debug_printf("\t\t.dword3.dword = 0x%x\n", (*ptr).dword3.dword);
-   debug_printf("\t\t.dword4.bits.pad = 0x%x\n", (*ptr).dword4.bits.pad);
    debug_printf("\t\t.dword4.bits.min_array_element = 0x%x\n", (*ptr).dword4.bits.min_array_element);
    debug_printf("\t\t.dword4.bits.depth = 0x%x\n", (*ptr).dword4.bits.depth);
-   debug_printf("\t\t.dword4.dword = 0x%x\n", (*ptr).dword4.dword);
 }
 
 void
@@ -396,31 +339,22 @@ brw_dump_depthbuffer_g4x(const struct brw_depthbuffer_g4x *ptr)
 {
    debug_printf("\t\t.header.bits.length = 0x%x\n", (*ptr).header.bits.length);
    debug_printf("\t\t.header.bits.opcode = 0x%x\n", (*ptr).header.bits.opcode);
-   debug_printf("\t\t.header.dword = 0x%x\n", (*ptr).header.dword);
    debug_printf("\t\t.dword1.bits.pitch = 0x%x\n", (*ptr).dword1.bits.pitch);
    debug_printf("\t\t.dword1.bits.format = 0x%x\n", (*ptr).dword1.bits.format);
-   debug_printf("\t\t.dword1.bits.pad = 0x%x\n", (*ptr).dword1.bits.pad);
    debug_printf("\t\t.dword1.bits.software_tiled_rendering_mode = 0x%x\n", (*ptr).dword1.bits.software_tiled_rendering_mode);
    debug_printf("\t\t.dword1.bits.depth_offset_disable = 0x%x\n", (*ptr).dword1.bits.depth_offset_disable);
    debug_printf("\t\t.dword1.bits.tile_walk = 0x%x\n", (*ptr).dword1.bits.tile_walk);
    debug_printf("\t\t.dword1.bits.tiled_surface = 0x%x\n", (*ptr).dword1.bits.tiled_surface);
-   debug_printf("\t\t.dword1.bits.pad2 = 0x%x\n", (*ptr).dword1.bits.pad2);
    debug_printf("\t\t.dword1.bits.surface_type = 0x%x\n", (*ptr).dword1.bits.surface_type);
-   debug_printf("\t\t.dword1.dword = 0x%x\n", (*ptr).dword1.dword);
    debug_printf("\t\t.dword2_base_addr = 0x%x\n", (*ptr).dword2_base_addr);
-   debug_printf("\t\t.dword3.bits.pad = 0x%x\n", (*ptr).dword3.bits.pad);
    debug_printf("\t\t.dword3.bits.mipmap_layout = 0x%x\n", (*ptr).dword3.bits.mipmap_layout);
    debug_printf("\t\t.dword3.bits.lod = 0x%x\n", (*ptr).dword3.bits.lod);
    debug_printf("\t\t.dword3.bits.width = 0x%x\n", (*ptr).dword3.bits.width);
    debug_printf("\t\t.dword3.bits.height = 0x%x\n", (*ptr).dword3.bits.height);
-   debug_printf("\t\t.dword3.dword = 0x%x\n", (*ptr).dword3.dword);
-   debug_printf("\t\t.dword4.bits.pad = 0x%x\n", (*ptr).dword4.bits.pad);
    debug_printf("\t\t.dword4.bits.min_array_element = 0x%x\n", (*ptr).dword4.bits.min_array_element);
    debug_printf("\t\t.dword4.bits.depth = 0x%x\n", (*ptr).dword4.bits.depth);
-   debug_printf("\t\t.dword4.dword = 0x%x\n", (*ptr).dword4.dword);
    debug_printf("\t\t.dword5.bits.xoffset = 0x%x\n", (*ptr).dword5.bits.xoffset);
    debug_printf("\t\t.dword5.bits.yoffset = 0x%x\n", (*ptr).dword5.bits.yoffset);
-   debug_printf("\t\t.dword5.dword = 0x%x\n", (*ptr).dword5.dword);
 }
 
 void
@@ -447,57 +381,38 @@ brw_dump_global_depth_offset_clamp(const struct brw_global_depth_offset_clamp *p
 void
 brw_dump_gs_unit_state(const struct brw_gs_unit_state *ptr)
 {
-   debug_printf("\t\t.thread0.pad0 = 0x%x\n", (*ptr).thread0.pad0);
    debug_printf("\t\t.thread0.grf_reg_count = 0x%x\n", (*ptr).thread0.grf_reg_count);
-   debug_printf("\t\t.thread0.pad1 = 0x%x\n", (*ptr).thread0.pad1);
    debug_printf("\t\t.thread0.kernel_start_pointer = 0x%x\n", (*ptr).thread0.kernel_start_pointer);
    debug_printf("\t\t.thread1.ext_halt_exception_enable = 0x%x\n", (*ptr).thread1.ext_halt_exception_enable);
    debug_printf("\t\t.thread1.sw_exception_enable = 0x%x\n", (*ptr).thread1.sw_exception_enable);
    debug_printf("\t\t.thread1.mask_stack_exception_enable = 0x%x\n", (*ptr).thread1.mask_stack_exception_enable);
    debug_printf("\t\t.thread1.timeout_exception_enable = 0x%x\n", (*ptr).thread1.timeout_exception_enable);
    debug_printf("\t\t.thread1.illegal_op_exception_enable = 0x%x\n", (*ptr).thread1.illegal_op_exception_enable);
-   debug_printf("\t\t.thread1.pad0 = 0x%x\n", (*ptr).thread1.pad0);
    debug_printf("\t\t.thread1.depth_coef_urb_read_offset = 0x%x\n", (*ptr).thread1.depth_coef_urb_read_offset);
-   debug_printf("\t\t.thread1.pad1 = 0x%x\n", (*ptr).thread1.pad1);
    debug_printf("\t\t.thread1.floating_point_mode = 0x%x\n", (*ptr).thread1.floating_point_mode);
    debug_printf("\t\t.thread1.thread_priority = 0x%x\n", (*ptr).thread1.thread_priority);
    debug_printf("\t\t.thread1.binding_table_entry_count = 0x%x\n", (*ptr).thread1.binding_table_entry_count);
-   debug_printf("\t\t.thread1.pad3 = 0x%x\n", (*ptr).thread1.pad3);
    debug_printf("\t\t.thread1.single_program_flow = 0x%x\n", (*ptr).thread1.single_program_flow);
    debug_printf("\t\t.thread2.per_thread_scratch_space = 0x%x\n", (*ptr).thread2.per_thread_scratch_space);
-   debug_printf("\t\t.thread2.pad0 = 0x%x\n", (*ptr).thread2.pad0);
    debug_printf("\t\t.thread2.scratch_space_base_pointer = 0x%x\n", (*ptr).thread2.scratch_space_base_pointer);
    debug_printf("\t\t.thread3.dispatch_grf_start_reg = 0x%x\n", (*ptr).thread3.dispatch_grf_start_reg);
    debug_printf("\t\t.thread3.urb_entry_read_offset = 0x%x\n", (*ptr).thread3.urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad0 = 0x%x\n", (*ptr).thread3.pad0);
    debug_printf("\t\t.thread3.urb_entry_read_length = 0x%x\n", (*ptr).thread3.urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad1 = 0x%x\n", (*ptr).thread3.pad1);
    debug_printf("\t\t.thread3.const_urb_entry_read_offset = 0x%x\n", (*ptr).thread3.const_urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad2 = 0x%x\n", (*ptr).thread3.pad2);
    debug_printf("\t\t.thread3.const_urb_entry_read_length = 0x%x\n", (*ptr).thread3.const_urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad3 = 0x%x\n", (*ptr).thread3.pad3);
-   debug_printf("\t\t.thread4.pad0 = 0x%x\n", (*ptr).thread4.pad0);
    debug_printf("\t\t.thread4.rendering_enable = 0x%x\n", (*ptr).thread4.rendering_enable);
-   debug_printf("\t\t.thread4.pad4 = 0x%x\n", (*ptr).thread4.pad4);
    debug_printf("\t\t.thread4.stats_enable = 0x%x\n", (*ptr).thread4.stats_enable);
    debug_printf("\t\t.thread4.nr_urb_entries = 0x%x\n", (*ptr).thread4.nr_urb_entries);
-   debug_printf("\t\t.thread4.pad1 = 0x%x\n", (*ptr).thread4.pad1);
    debug_printf("\t\t.thread4.urb_entry_allocation_size = 0x%x\n", (*ptr).thread4.urb_entry_allocation_size);
-   debug_printf("\t\t.thread4.pad2 = 0x%x\n", (*ptr).thread4.pad2);
    debug_printf("\t\t.thread4.max_threads = 0x%x\n", (*ptr).thread4.max_threads);
-   debug_printf("\t\t.thread4.pad3 = 0x%x\n", (*ptr).thread4.pad3);
    debug_printf("\t\t.gs5.sampler_count = 0x%x\n", (*ptr).gs5.sampler_count);
-   debug_printf("\t\t.gs5.pad0 = 0x%x\n", (*ptr).gs5.pad0);
    debug_printf("\t\t.gs5.sampler_state_pointer = 0x%x\n", (*ptr).gs5.sampler_state_pointer);
    debug_printf("\t\t.gs6.max_vp_index = 0x%x\n", (*ptr).gs6.max_vp_index);
-   debug_printf("\t\t.gs6.pad0 = 0x%x\n", (*ptr).gs6.pad0);
    debug_printf("\t\t.gs6.svbi_post_inc_value = 0x%x\n", (*ptr).gs6.svbi_post_inc_value);
-   debug_printf("\t\t.gs6.pad1 = 0x%x\n", (*ptr).gs6.pad1);
    debug_printf("\t\t.gs6.svbi_post_inc_enable = 0x%x\n", (*ptr).gs6.svbi_post_inc_enable);
    debug_printf("\t\t.gs6.svbi_payload = 0x%x\n", (*ptr).gs6.svbi_payload);
    debug_printf("\t\t.gs6.discard_adjaceny = 0x%x\n", (*ptr).gs6.discard_adjaceny);
    debug_printf("\t\t.gs6.reorder_enable = 0x%x\n", (*ptr).gs6.reorder_enable);
-   debug_printf("\t\t.gs6.pad2 = 0x%x\n", (*ptr).gs6.pad2);
 }
 
 void
@@ -506,9 +421,7 @@ brw_dump_indexbuffer(const struct brw_indexbuffer *ptr)
    debug_printf("\t\t.header.bits.length = 0x%x\n", (*ptr).header.bits.length);
    debug_printf("\t\t.header.bits.index_format = 0x%x\n", (*ptr).header.bits.index_format);
    debug_printf("\t\t.header.bits.cut_index_enable = 0x%x\n", (*ptr).header.bits.cut_index_enable);
-   debug_printf("\t\t.header.bits.pad = 0x%x\n", (*ptr).header.bits.pad);
    debug_printf("\t\t.header.bits.opcode = 0x%x\n", (*ptr).header.bits.opcode);
-   debug_printf("\t\t.header.dword = 0x%x\n", (*ptr).header.dword);
    debug_printf("\t\t.buffer_start = 0x%x\n", (*ptr).buffer_start);
    debug_printf("\t\t.buffer_end = 0x%x\n", (*ptr).buffer_end);
 }
@@ -519,9 +432,7 @@ brw_dump_line_stipple(const struct brw_line_stipple *ptr)
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.bits0.pattern = 0x%x\n", (*ptr).bits0.pattern);
-   debug_printf("\t\t.bits0.pad = 0x%x\n", (*ptr).bits0.pad);
    debug_printf("\t\t.bits1.repeat_count = 0x%x\n", (*ptr).bits1.repeat_count);
-   debug_printf("\t\t.bits1.pad = 0x%x\n", (*ptr).bits1.pad);
    debug_printf("\t\t.bits1.inverse_repeat_count = 0x%x\n", (*ptr).bits1.inverse_repeat_count);
 }
 
@@ -529,7 +440,6 @@ void
 brw_dump_mi_flush(const struct brw_mi_flush *ptr)
 {
    debug_printf("\t\t.flags = 0x%x\n", (*ptr).flags);
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.opcode = 0x%x\n", (*ptr).opcode);
 }
 
@@ -545,7 +455,6 @@ brw_dump_pipe_control(const struct brw_pipe_control *ptr)
    debug_printf("\t\t.header.depth_stall_enable = 0x%x\n", (*ptr).header.depth_stall_enable);
    debug_printf("\t\t.header.post_sync_operation = 0x%x\n", (*ptr).header.post_sync_operation);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
-   debug_printf("\t\t.bits1.pad = 0x%x\n", (*ptr).bits1.pad);
    debug_printf("\t\t.bits1.dest_addr_type = 0x%x\n", (*ptr).bits1.dest_addr_type);
    debug_printf("\t\t.bits1.dest_addr = 0x%x\n", (*ptr).bits1.dest_addr);
    debug_printf("\t\t.data0 = 0x%x\n", (*ptr).data0);
@@ -556,7 +465,6 @@ void
 brw_dump_pipeline_select(const struct brw_pipeline_select *ptr)
 {
    debug_printf("\t\t.header.pipeline_select = 0x%x\n", (*ptr).header.pipeline_select);
-   debug_printf("\t\t.header.pad = 0x%x\n", (*ptr).header.pad);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
 }
 
@@ -565,19 +473,13 @@ brw_dump_pipelined_state_pointers(const struct brw_pipelined_state_pointers *ptr
 {
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
-   debug_printf("\t\t.vs.pad = 0x%x\n", (*ptr).vs.pad);
    debug_printf("\t\t.vs.offset = 0x%x\n", (*ptr).vs.offset);
    debug_printf("\t\t.gs.enable = 0x%x\n", (*ptr).gs.enable);
-   debug_printf("\t\t.gs.pad = 0x%x\n", (*ptr).gs.pad);
    debug_printf("\t\t.gs.offset = 0x%x\n", (*ptr).gs.offset);
    debug_printf("\t\t.clp.enable = 0x%x\n", (*ptr).clp.enable);
-   debug_printf("\t\t.clp.pad = 0x%x\n", (*ptr).clp.pad);
    debug_printf("\t\t.clp.offset = 0x%x\n", (*ptr).clp.offset);
-   debug_printf("\t\t.sf.pad = 0x%x\n", (*ptr).sf.pad);
    debug_printf("\t\t.sf.offset = 0x%x\n", (*ptr).sf.offset);
-   debug_printf("\t\t.wm.pad = 0x%x\n", (*ptr).wm.pad);
    debug_printf("\t\t.wm.offset = 0x%x\n", (*ptr).wm.offset);
-   debug_printf("\t\t.cc.pad = 0x%x\n", (*ptr).cc.pad);
    debug_printf("\t\t.cc.offset = 0x%x\n", (*ptr).cc.offset);
 }
 
@@ -626,9 +528,7 @@ brw_dump_polygon_stipple_offset(const struct brw_polygon_stipple_offset *ptr)
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.bits0.y_offset = 0x%x\n", (*ptr).bits0.y_offset);
-   debug_printf("\t\t.bits0.pad = 0x%x\n", (*ptr).bits0.pad);
    debug_printf("\t\t.bits0.x_offset = 0x%x\n", (*ptr).bits0.x_offset);
-   debug_printf("\t\t.bits0.pad0 = 0x%x\n", (*ptr).bits0.pad0);
 }
 
 void
@@ -649,20 +549,15 @@ brw_dump_sampler_state(const struct brw_sampler_state *ptr)
    debug_printf("\t\t.ss0.mag_filter = 0x%x\n", (*ptr).ss0.mag_filter);
    debug_printf("\t\t.ss0.mip_filter = 0x%x\n", (*ptr).ss0.mip_filter);
    debug_printf("\t\t.ss0.base_level = 0x%x\n", (*ptr).ss0.base_level);
-   debug_printf("\t\t.ss0.pad = 0x%x\n", (*ptr).ss0.pad);
    debug_printf("\t\t.ss0.lod_preclamp = 0x%x\n", (*ptr).ss0.lod_preclamp);
    debug_printf("\t\t.ss0.default_color_mode = 0x%x\n", (*ptr).ss0.default_color_mode);
-   debug_printf("\t\t.ss0.pad0 = 0x%x\n", (*ptr).ss0.pad0);
    debug_printf("\t\t.ss0.disable = 0x%x\n", (*ptr).ss0.disable);
    debug_printf("\t\t.ss1.r_wrap_mode = 0x%x\n", (*ptr).ss1.r_wrap_mode);
    debug_printf("\t\t.ss1.t_wrap_mode = 0x%x\n", (*ptr).ss1.t_wrap_mode);
    debug_printf("\t\t.ss1.s_wrap_mode = 0x%x\n", (*ptr).ss1.s_wrap_mode);
-   debug_printf("\t\t.ss1.pad = 0x%x\n", (*ptr).ss1.pad);
    debug_printf("\t\t.ss1.max_lod = 0x%x\n", (*ptr).ss1.max_lod);
    debug_printf("\t\t.ss1.min_lod = 0x%x\n", (*ptr).ss1.min_lod);
-   debug_printf("\t\t.ss2.pad = 0x%x\n", (*ptr).ss2.pad);
    debug_printf("\t\t.ss2.default_color_pointer = 0x%x\n", (*ptr).ss2.default_color_pointer);
-   debug_printf("\t\t.ss3.pad = 0x%x\n", (*ptr).ss3.pad);
    debug_printf("\t\t.ss3.max_aniso = 0x%x\n", (*ptr).ss3.max_aniso);
    debug_printf("\t\t.ss3.chroma_key_mode = 0x%x\n", (*ptr).ss3.chroma_key_mode);
    debug_printf("\t\t.ss3.chroma_key_index = 0x%x\n", (*ptr).ss3.chroma_key_index);
@@ -674,48 +569,32 @@ brw_dump_sampler_state(const struct brw_sampler_state *ptr)
 void
 brw_dump_sf_unit_state(const struct brw_sf_unit_state *ptr)
 {
-   debug_printf("\t\t.thread0.pad0 = 0x%x\n", (*ptr).thread0.pad0);
    debug_printf("\t\t.thread0.grf_reg_count = 0x%x\n", (*ptr).thread0.grf_reg_count);
-   debug_printf("\t\t.thread0.pad1 = 0x%x\n", (*ptr).thread0.pad1);
    debug_printf("\t\t.thread0.kernel_start_pointer = 0x%x\n", (*ptr).thread0.kernel_start_pointer);
    debug_printf("\t\t.thread1.ext_halt_exception_enable = 0x%x\n", (*ptr).thread1.ext_halt_exception_enable);
    debug_printf("\t\t.thread1.sw_exception_enable = 0x%x\n", (*ptr).thread1.sw_exception_enable);
    debug_printf("\t\t.thread1.mask_stack_exception_enable = 0x%x\n", (*ptr).thread1.mask_stack_exception_enable);
    debug_printf("\t\t.thread1.timeout_exception_enable = 0x%x\n", (*ptr).thread1.timeout_exception_enable);
    debug_printf("\t\t.thread1.illegal_op_exception_enable = 0x%x\n", (*ptr).thread1.illegal_op_exception_enable);
-   debug_printf("\t\t.thread1.pad0 = 0x%x\n", (*ptr).thread1.pad0);
    debug_printf("\t\t.thread1.depth_coef_urb_read_offset = 0x%x\n", (*ptr).thread1.depth_coef_urb_read_offset);
-   debug_printf("\t\t.thread1.pad1 = 0x%x\n", (*ptr).thread1.pad1);
    debug_printf("\t\t.thread1.floating_point_mode = 0x%x\n", (*ptr).thread1.floating_point_mode);
    debug_printf("\t\t.thread1.thread_priority = 0x%x\n", (*ptr).thread1.thread_priority);
    debug_printf("\t\t.thread1.binding_table_entry_count = 0x%x\n", (*ptr).thread1.binding_table_entry_count);
-   debug_printf("\t\t.thread1.pad3 = 0x%x\n", (*ptr).thread1.pad3);
    debug_printf("\t\t.thread1.single_program_flow = 0x%x\n", (*ptr).thread1.single_program_flow);
    debug_printf("\t\t.thread2.per_thread_scratch_space = 0x%x\n", (*ptr).thread2.per_thread_scratch_space);
-   debug_printf("\t\t.thread2.pad0 = 0x%x\n", (*ptr).thread2.pad0);
    debug_printf("\t\t.thread2.scratch_space_base_pointer = 0x%x\n", (*ptr).thread2.scratch_space_base_pointer);
    debug_printf("\t\t.thread3.dispatch_grf_start_reg = 0x%x\n", (*ptr).thread3.dispatch_grf_start_reg);
    debug_printf("\t\t.thread3.urb_entry_read_offset = 0x%x\n", (*ptr).thread3.urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad0 = 0x%x\n", (*ptr).thread3.pad0);
    debug_printf("\t\t.thread3.urb_entry_read_length = 0x%x\n", (*ptr).thread3.urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad1 = 0x%x\n", (*ptr).thread3.pad1);
    debug_printf("\t\t.thread3.const_urb_entry_read_offset = 0x%x\n", (*ptr).thread3.const_urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad2 = 0x%x\n", (*ptr).thread3.pad2);
    debug_printf("\t\t.thread3.const_urb_entry_read_length = 0x%x\n", (*ptr).thread3.const_urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad3 = 0x%x\n", (*ptr).thread3.pad3);
-   debug_printf("\t\t.thread4.pad0 = 0x%x\n", (*ptr).thread4.pad0);
    debug_printf("\t\t.thread4.stats_enable = 0x%x\n", (*ptr).thread4.stats_enable);
    debug_printf("\t\t.thread4.nr_urb_entries = 0x%x\n", (*ptr).thread4.nr_urb_entries);
-   debug_printf("\t\t.thread4.pad1 = 0x%x\n", (*ptr).thread4.pad1);
    debug_printf("\t\t.thread4.urb_entry_allocation_size = 0x%x\n", (*ptr).thread4.urb_entry_allocation_size);
-   debug_printf("\t\t.thread4.pad2 = 0x%x\n", (*ptr).thread4.pad2);
    debug_printf("\t\t.thread4.max_threads = 0x%x\n", (*ptr).thread4.max_threads);
-   debug_printf("\t\t.thread4.pad3 = 0x%x\n", (*ptr).thread4.pad3);
    debug_printf("\t\t.sf5.front_winding = 0x%x\n", (*ptr).sf5.front_winding);
    debug_printf("\t\t.sf5.viewport_transform = 0x%x\n", (*ptr).sf5.viewport_transform);
-   debug_printf("\t\t.sf5.pad0 = 0x%x\n", (*ptr).sf5.pad0);
    debug_printf("\t\t.sf5.sf_viewport_state_offset = 0x%x\n", (*ptr).sf5.sf_viewport_state_offset);
-   debug_printf("\t\t.sf6.pad0 = 0x%x\n", (*ptr).sf6.pad0);
    debug_printf("\t\t.sf6.dest_org_vbias = 0x%x\n", (*ptr).sf6.dest_org_vbias);
    debug_printf("\t\t.sf6.dest_org_hbias = 0x%x\n", (*ptr).sf6.dest_org_hbias);
    debug_printf("\t\t.sf6.scissor = 0x%x\n", (*ptr).sf6.scissor);
@@ -731,7 +610,6 @@ brw_dump_sf_unit_state(const struct brw_sf_unit_state *ptr)
    debug_printf("\t\t.sf7.use_point_size_state = 0x%x\n", (*ptr).sf7.use_point_size_state);
    debug_printf("\t\t.sf7.subpixel_precision = 0x%x\n", (*ptr).sf7.subpixel_precision);
    debug_printf("\t\t.sf7.sprite_point = 0x%x\n", (*ptr).sf7.sprite_point);
-   debug_printf("\t\t.sf7.pad0 = 0x%x\n", (*ptr).sf7.pad0);
    debug_printf("\t\t.sf7.aa_line_distance_mode = 0x%x\n", (*ptr).sf7.aa_line_distance_mode);
    debug_printf("\t\t.sf7.trifan_pv = 0x%x\n", (*ptr).sf7.trifan_pv);
    debug_printf("\t\t.sf7.linestrip_pv = 0x%x\n", (*ptr).sf7.linestrip_pv);
@@ -763,10 +641,8 @@ brw_dump_ss0(const struct brw_ss0 *ptr)
    debug_printf("\t\t.mag_filter = 0x%x\n", (*ptr).mag_filter);
    debug_printf("\t\t.mip_filter = 0x%x\n", (*ptr).mip_filter);
    debug_printf("\t\t.base_level = 0x%x\n", (*ptr).base_level);
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.lod_preclamp = 0x%x\n", (*ptr).lod_preclamp);
    debug_printf("\t\t.default_color_mode = 0x%x\n", (*ptr).default_color_mode);
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.disable = 0x%x\n", (*ptr).disable);
 }
 
@@ -776,7 +652,6 @@ brw_dump_ss1(const struct brw_ss1 *ptr)
    debug_printf("\t\t.r_wrap_mode = 0x%x\n", (*ptr).r_wrap_mode);
    debug_printf("\t\t.t_wrap_mode = 0x%x\n", (*ptr).t_wrap_mode);
    debug_printf("\t\t.s_wrap_mode = 0x%x\n", (*ptr).s_wrap_mode);
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.max_lod = 0x%x\n", (*ptr).max_lod);
    debug_printf("\t\t.min_lod = 0x%x\n", (*ptr).min_lod);
 }
@@ -784,14 +659,12 @@ brw_dump_ss1(const struct brw_ss1 *ptr)
 void
 brw_dump_ss2(const struct brw_ss2 *ptr)
 {
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.default_color_pointer = 0x%x\n", (*ptr).default_color_pointer);
 }
 
 void
 brw_dump_ss3(const struct brw_ss3 *ptr)
 {
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.max_aniso = 0x%x\n", (*ptr).max_aniso);
    debug_printf("\t\t.chroma_key_mode = 0x%x\n", (*ptr).chroma_key_mode);
    debug_printf("\t\t.chroma_key_index = 0x%x\n", (*ptr).chroma_key_index);
@@ -806,19 +679,14 @@ brw_dump_state_base_address(const struct brw_state_base_address *ptr)
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.bits0.modify_enable = 0x%x\n", (*ptr).bits0.modify_enable);
-   debug_printf("\t\t.bits0.pad = 0x%x\n", (*ptr).bits0.pad);
    debug_printf("\t\t.bits0.general_state_address = 0x%x\n", (*ptr).bits0.general_state_address);
    debug_printf("\t\t.bits1.modify_enable = 0x%x\n", (*ptr).bits1.modify_enable);
-   debug_printf("\t\t.bits1.pad = 0x%x\n", (*ptr).bits1.pad);
    debug_printf("\t\t.bits1.surface_state_address = 0x%x\n", (*ptr).bits1.surface_state_address);
    debug_printf("\t\t.bits2.modify_enable = 0x%x\n", (*ptr).bits2.modify_enable);
-   debug_printf("\t\t.bits2.pad = 0x%x\n", (*ptr).bits2.pad);
    debug_printf("\t\t.bits2.indirect_object_state_address = 0x%x\n", (*ptr).bits2.indirect_object_state_address);
    debug_printf("\t\t.bits3.modify_enable = 0x%x\n", (*ptr).bits3.modify_enable);
-   debug_printf("\t\t.bits3.pad = 0x%x\n", (*ptr).bits3.pad);
    debug_printf("\t\t.bits3.general_state_upper_bound = 0x%x\n", (*ptr).bits3.general_state_upper_bound);
    debug_printf("\t\t.bits4.modify_enable = 0x%x\n", (*ptr).bits4.modify_enable);
-   debug_printf("\t\t.bits4.pad = 0x%x\n", (*ptr).bits4.pad);
    debug_printf("\t\t.bits4.indirect_object_state_upper_bound = 0x%x\n", (*ptr).bits4.indirect_object_state_upper_bound);
 }
 
@@ -828,7 +696,6 @@ brw_dump_state_prefetch(const struct brw_state_prefetch *ptr)
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.bits0.prefetch_count = 0x%x\n", (*ptr).bits0.prefetch_count);
-   debug_printf("\t\t.bits0.pad = 0x%x\n", (*ptr).bits0.pad);
    debug_printf("\t\t.bits0.prefetch_pointer = 0x%x\n", (*ptr).bits0.prefetch_pointer);
 }
 
@@ -841,7 +708,6 @@ brw_dump_surf_ss0(const struct brw_surf_ss0 *ptr)
    debug_printf("\t\t.cube_neg_y = 0x%x\n", (*ptr).cube_neg_y);
    debug_printf("\t\t.cube_pos_x = 0x%x\n", (*ptr).cube_pos_x);
    debug_printf("\t\t.cube_neg_x = 0x%x\n", (*ptr).cube_neg_x);
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.mipmap_layout_mode = 0x%x\n", (*ptr).mipmap_layout_mode);
    debug_printf("\t\t.vert_line_stride_ofs = 0x%x\n", (*ptr).vert_line_stride_ofs);
    debug_printf("\t\t.vert_line_stride = 0x%x\n", (*ptr).vert_line_stride);
@@ -852,7 +718,6 @@ brw_dump_surf_ss0(const struct brw_surf_ss0 *ptr)
    debug_printf("\t\t.writedisable_alpha = 0x%x\n", (*ptr).writedisable_alpha);
    debug_printf("\t\t.surface_format = 0x%x\n", (*ptr).surface_format);
    debug_printf("\t\t.data_return_format = 0x%x\n", (*ptr).data_return_format);
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.surface_type = 0x%x\n", (*ptr).surface_type);
 }
 
@@ -865,7 +730,6 @@ brw_dump_surf_ss1(const struct brw_surf_ss1 *ptr)
 void
 brw_dump_surf_ss2(const struct brw_surf_ss2 *ptr)
 {
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.mip_count = 0x%x\n", (*ptr).mip_count);
    debug_printf("\t\t.width = 0x%x\n", (*ptr).width);
    debug_printf("\t\t.height = 0x%x\n", (*ptr).height);
@@ -876,7 +740,6 @@ brw_dump_surf_ss3(const struct brw_surf_ss3 *ptr)
 {
    debug_printf("\t\t.tile_walk = 0x%x\n", (*ptr).tile_walk);
    debug_printf("\t\t.tiled_surface = 0x%x\n", (*ptr).tiled_surface);
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.pitch = 0x%x\n", (*ptr).pitch);
    debug_printf("\t\t.depth = 0x%x\n", (*ptr).depth);
 }
@@ -885,9 +748,7 @@ void
 brw_dump_surf_ss4(const struct brw_surf_ss4 *ptr)
 {
    debug_printf("\t\t.multisample_position_palette_index = 0x%x\n", (*ptr).multisample_position_palette_index);
-   debug_printf("\t\t.pad1 = 0x%x\n", (*ptr).pad1);
    debug_printf("\t\t.num_multisamples = 0x%x\n", (*ptr).num_multisamples);
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.render_target_view_extent = 0x%x\n", (*ptr).render_target_view_extent);
    debug_printf("\t\t.min_array_elt = 0x%x\n", (*ptr).min_array_elt);
    debug_printf("\t\t.min_lod = 0x%x\n", (*ptr).min_lod);
@@ -896,13 +757,11 @@ brw_dump_surf_ss4(const struct brw_surf_ss4 *ptr)
 void
 brw_dump_surf_ss5(const struct brw_surf_ss5 *ptr)
 {
-   debug_printf("\t\t.pad1 = 0x%x\n", (*ptr).pad1);
    debug_printf("\t\t.llc_mapping = 0x%x\n", (*ptr).llc_mapping);
    debug_printf("\t\t.mlc_mapping = 0x%x\n", (*ptr).mlc_mapping);
    debug_printf("\t\t.gfdt = 0x%x\n", (*ptr).gfdt);
    debug_printf("\t\t.gfdt_src = 0x%x\n", (*ptr).gfdt_src);
    debug_printf("\t\t.y_offset = 0x%x\n", (*ptr).y_offset);
-   debug_printf("\t\t.pad0 = 0x%x\n", (*ptr).pad0);
    debug_printf("\t\t.x_offset = 0x%x\n", (*ptr).x_offset);
 }
 
@@ -915,7 +774,6 @@ brw_dump_surface_state(const struct brw_surface_state *ptr)
    debug_printf("\t\t.ss0.cube_neg_y = 0x%x\n", (*ptr).ss0.cube_neg_y);
    debug_printf("\t\t.ss0.cube_pos_x = 0x%x\n", (*ptr).ss0.cube_pos_x);
    debug_printf("\t\t.ss0.cube_neg_x = 0x%x\n", (*ptr).ss0.cube_neg_x);
-   debug_printf("\t\t.ss0.pad = 0x%x\n", (*ptr).ss0.pad);
    debug_printf("\t\t.ss0.mipmap_layout_mode = 0x%x\n", (*ptr).ss0.mipmap_layout_mode);
    debug_printf("\t\t.ss0.vert_line_stride_ofs = 0x%x\n", (*ptr).ss0.vert_line_stride_ofs);
    debug_printf("\t\t.ss0.vert_line_stride = 0x%x\n", (*ptr).ss0.vert_line_stride);
@@ -926,32 +784,25 @@ brw_dump_surface_state(const struct brw_surface_state *ptr)
    debug_printf("\t\t.ss0.writedisable_alpha = 0x%x\n", (*ptr).ss0.writedisable_alpha);
    debug_printf("\t\t.ss0.surface_format = 0x%x\n", (*ptr).ss0.surface_format);
    debug_printf("\t\t.ss0.data_return_format = 0x%x\n", (*ptr).ss0.data_return_format);
-   debug_printf("\t\t.ss0.pad0 = 0x%x\n", (*ptr).ss0.pad0);
    debug_printf("\t\t.ss0.surface_type = 0x%x\n", (*ptr).ss0.surface_type);
    debug_printf("\t\t.ss1.base_addr = 0x%x\n", (*ptr).ss1.base_addr);
-   debug_printf("\t\t.ss2.pad = 0x%x\n", (*ptr).ss2.pad);
    debug_printf("\t\t.ss2.mip_count = 0x%x\n", (*ptr).ss2.mip_count);
    debug_printf("\t\t.ss2.width = 0x%x\n", (*ptr).ss2.width);
    debug_printf("\t\t.ss2.height = 0x%x\n", (*ptr).ss2.height);
    debug_printf("\t\t.ss3.tile_walk = 0x%x\n", (*ptr).ss3.tile_walk);
    debug_printf("\t\t.ss3.tiled_surface = 0x%x\n", (*ptr).ss3.tiled_surface);
-   debug_printf("\t\t.ss3.pad = 0x%x\n", (*ptr).ss3.pad);
    debug_printf("\t\t.ss3.pitch = 0x%x\n", (*ptr).ss3.pitch);
    debug_printf("\t\t.ss3.depth = 0x%x\n", (*ptr).ss3.depth);
    debug_printf("\t\t.ss4.multisample_position_palette_index = 0x%x\n", (*ptr).ss4.multisample_position_palette_index);
-   debug_printf("\t\t.ss4.pad1 = 0x%x\n", (*ptr).ss4.pad1);
    debug_printf("\t\t.ss4.num_multisamples = 0x%x\n", (*ptr).ss4.num_multisamples);
-   debug_printf("\t\t.ss4.pad0 = 0x%x\n", (*ptr).ss4.pad0);
    debug_printf("\t\t.ss4.render_target_view_extent = 0x%x\n", (*ptr).ss4.render_target_view_extent);
    debug_printf("\t\t.ss4.min_array_elt = 0x%x\n", (*ptr).ss4.min_array_elt);
    debug_printf("\t\t.ss4.min_lod = 0x%x\n", (*ptr).ss4.min_lod);
-   debug_printf("\t\t.ss5.pad1 = 0x%x\n", (*ptr).ss5.pad1);
    debug_printf("\t\t.ss5.llc_mapping = 0x%x\n", (*ptr).ss5.llc_mapping);
    debug_printf("\t\t.ss5.mlc_mapping = 0x%x\n", (*ptr).ss5.mlc_mapping);
    debug_printf("\t\t.ss5.gfdt = 0x%x\n", (*ptr).ss5.gfdt);
    debug_printf("\t\t.ss5.gfdt_src = 0x%x\n", (*ptr).ss5.gfdt_src);
    debug_printf("\t\t.ss5.y_offset = 0x%x\n", (*ptr).ss5.y_offset);
-   debug_printf("\t\t.ss5.pad0 = 0x%x\n", (*ptr).ss5.pad0);
    debug_printf("\t\t.ss5.x_offset = 0x%x\n", (*ptr).ss5.x_offset);
 }
 
@@ -960,7 +811,6 @@ brw_dump_system_instruction_pointer(const struct brw_system_instruction_pointer
 {
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
-   debug_printf("\t\t.bits0.pad = 0x%x\n", (*ptr).bits0.pad);
    debug_printf("\t\t.bits0.system_instruction_pointer = 0x%x\n", (*ptr).bits0.system_instruction_pointer);
 }
 
@@ -974,16 +824,13 @@ brw_dump_urb_fence(const struct brw_urb_fence *ptr)
    debug_printf("\t\t.header.sf_realloc = 0x%x\n", (*ptr).header.sf_realloc);
    debug_printf("\t\t.header.vfe_realloc = 0x%x\n", (*ptr).header.vfe_realloc);
    debug_printf("\t\t.header.cs_realloc = 0x%x\n", (*ptr).header.cs_realloc);
-   debug_printf("\t\t.header.pad = 0x%x\n", (*ptr).header.pad);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.bits0.vs_fence = 0x%x\n", (*ptr).bits0.vs_fence);
    debug_printf("\t\t.bits0.gs_fence = 0x%x\n", (*ptr).bits0.gs_fence);
    debug_printf("\t\t.bits0.clp_fence = 0x%x\n", (*ptr).bits0.clp_fence);
-   debug_printf("\t\t.bits0.pad = 0x%x\n", (*ptr).bits0.pad);
    debug_printf("\t\t.bits1.sf_fence = 0x%x\n", (*ptr).bits1.sf_fence);
    debug_printf("\t\t.bits1.vf_fence = 0x%x\n", (*ptr).bits1.vf_fence);
    debug_printf("\t\t.bits1.cs_fence = 0x%x\n", (*ptr).bits1.cs_fence);
-   debug_printf("\t\t.bits1.pad = 0x%x\n", (*ptr).bits1.pad);
 }
 
 void
@@ -992,14 +839,12 @@ brw_dump_urb_immediate(const struct brw_urb_immediate *ptr)
    debug_printf("\t\t.opcode = 0x%x\n", (*ptr).opcode);
    debug_printf("\t\t.offset = 0x%x\n", (*ptr).offset);
    debug_printf("\t\t.swizzle_control = 0x%x\n", (*ptr).swizzle_control);
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.allocate = 0x%x\n", (*ptr).allocate);
    debug_printf("\t\t.used = 0x%x\n", (*ptr).used);
    debug_printf("\t\t.complete = 0x%x\n", (*ptr).complete);
    debug_printf("\t\t.response_length = 0x%x\n", (*ptr).response_length);
    debug_printf("\t\t.msg_length = 0x%x\n", (*ptr).msg_length);
    debug_printf("\t\t.msg_target = 0x%x\n", (*ptr).msg_target);
-   debug_printf("\t\t.pad1 = 0x%x\n", (*ptr).pad1);
    debug_printf("\t\t.end_of_thread = 0x%x\n", (*ptr).end_of_thread);
 }
 
@@ -1009,119 +854,102 @@ brw_dump_vb_array_state(const struct brw_vb_array_state *ptr)
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.vb[0].vb0.pitch = 0x%x\n", (*ptr).vb[0].vb0.pitch);
-   debug_printf("\t\t.vb[0].vb0.pad = 0x%x\n", (*ptr).vb[0].vb0.pad);
    debug_printf("\t\t.vb[0].vb0.access_type = 0x%x\n", (*ptr).vb[0].vb0.access_type);
    debug_printf("\t\t.vb[0].vb0.vb_index = 0x%x\n", (*ptr).vb[0].vb0.vb_index);
    debug_printf("\t\t.vb[0].start_addr = 0x%x\n", (*ptr).vb[0].start_addr);
    debug_printf("\t\t.vb[0].max_index = 0x%x\n", (*ptr).vb[0].max_index);
    debug_printf("\t\t.vb[0].instance_data_step_rate = 0x%x\n", (*ptr).vb[0].instance_data_step_rate);
    debug_printf("\t\t.vb[1].vb0.pitch = 0x%x\n", (*ptr).vb[1].vb0.pitch);
-   debug_printf("\t\t.vb[1].vb0.pad = 0x%x\n", (*ptr).vb[1].vb0.pad);
    debug_printf("\t\t.vb[1].vb0.access_type = 0x%x\n", (*ptr).vb[1].vb0.access_type);
    debug_printf("\t\t.vb[1].vb0.vb_index = 0x%x\n", (*ptr).vb[1].vb0.vb_index);
    debug_printf("\t\t.vb[1].start_addr = 0x%x\n", (*ptr).vb[1].start_addr);
    debug_printf("\t\t.vb[1].max_index = 0x%x\n", (*ptr).vb[1].max_index);
    debug_printf("\t\t.vb[1].instance_data_step_rate = 0x%x\n", (*ptr).vb[1].instance_data_step_rate);
    debug_printf("\t\t.vb[2].vb0.pitch = 0x%x\n", (*ptr).vb[2].vb0.pitch);
-   debug_printf("\t\t.vb[2].vb0.pad = 0x%x\n", (*ptr).vb[2].vb0.pad);
    debug_printf("\t\t.vb[2].vb0.access_type = 0x%x\n", (*ptr).vb[2].vb0.access_type);
    debug_printf("\t\t.vb[2].vb0.vb_index = 0x%x\n", (*ptr).vb[2].vb0.vb_index);
    debug_printf("\t\t.vb[2].start_addr = 0x%x\n", (*ptr).vb[2].start_addr);
    debug_printf("\t\t.vb[2].max_index = 0x%x\n", (*ptr).vb[2].max_index);
    debug_printf("\t\t.vb[2].instance_data_step_rate = 0x%x\n", (*ptr).vb[2].instance_data_step_rate);
    debug_printf("\t\t.vb[3].vb0.pitch = 0x%x\n", (*ptr).vb[3].vb0.pitch);
-   debug_printf("\t\t.vb[3].vb0.pad = 0x%x\n", (*ptr).vb[3].vb0.pad);
    debug_printf("\t\t.vb[3].vb0.access_type = 0x%x\n", (*ptr).vb[3].vb0.access_type);
    debug_printf("\t\t.vb[3].vb0.vb_index = 0x%x\n", (*ptr).vb[3].vb0.vb_index);
    debug_printf("\t\t.vb[3].start_addr = 0x%x\n", (*ptr).vb[3].start_addr);
    debug_printf("\t\t.vb[3].max_index = 0x%x\n", (*ptr).vb[3].max_index);
    debug_printf("\t\t.vb[3].instance_data_step_rate = 0x%x\n", (*ptr).vb[3].instance_data_step_rate);
    debug_printf("\t\t.vb[4].vb0.pitch = 0x%x\n", (*ptr).vb[4].vb0.pitch);
-   debug_printf("\t\t.vb[4].vb0.pad = 0x%x\n", (*ptr).vb[4].vb0.pad);
    debug_printf("\t\t.vb[4].vb0.access_type = 0x%x\n", (*ptr).vb[4].vb0.access_type);
    debug_printf("\t\t.vb[4].vb0.vb_index = 0x%x\n", (*ptr).vb[4].vb0.vb_index);
    debug_printf("\t\t.vb[4].start_addr = 0x%x\n", (*ptr).vb[4].start_addr);
    debug_printf("\t\t.vb[4].max_index = 0x%x\n", (*ptr).vb[4].max_index);
    debug_printf("\t\t.vb[4].instance_data_step_rate = 0x%x\n", (*ptr).vb[4].instance_data_step_rate);
    debug_printf("\t\t.vb[5].vb0.pitch = 0x%x\n", (*ptr).vb[5].vb0.pitch);
-   debug_printf("\t\t.vb[5].vb0.pad = 0x%x\n", (*ptr).vb[5].vb0.pad);
    debug_printf("\t\t.vb[5].vb0.access_type = 0x%x\n", (*ptr).vb[5].vb0.access_type);
    debug_printf("\t\t.vb[5].vb0.vb_index = 0x%x\n", (*ptr).vb[5].vb0.vb_index);
    debug_printf("\t\t.vb[5].start_addr = 0x%x\n", (*ptr).vb[5].start_addr);
    debug_printf("\t\t.vb[5].max_index = 0x%x\n", (*ptr).vb[5].max_index);
    debug_printf("\t\t.vb[5].instance_data_step_rate = 0x%x\n", (*ptr).vb[5].instance_data_step_rate);
    debug_printf("\t\t.vb[6].vb0.pitch = 0x%x\n", (*ptr).vb[6].vb0.pitch);
-   debug_printf("\t\t.vb[6].vb0.pad = 0x%x\n", (*ptr).vb[6].vb0.pad);
    debug_printf("\t\t.vb[6].vb0.access_type = 0x%x\n", (*ptr).vb[6].vb0.access_type);
    debug_printf("\t\t.vb[6].vb0.vb_index = 0x%x\n", (*ptr).vb[6].vb0.vb_index);
    debug_printf("\t\t.vb[6].start_addr = 0x%x\n", (*ptr).vb[6].start_addr);
    debug_printf("\t\t.vb[6].max_index = 0x%x\n", (*ptr).vb[6].max_index);
    debug_printf("\t\t.vb[6].instance_data_step_rate = 0x%x\n", (*ptr).vb[6].instance_data_step_rate);
    debug_printf("\t\t.vb[7].vb0.pitch = 0x%x\n", (*ptr).vb[7].vb0.pitch);
-   debug_printf("\t\t.vb[7].vb0.pad = 0x%x\n", (*ptr).vb[7].vb0.pad);
    debug_printf("\t\t.vb[7].vb0.access_type = 0x%x\n", (*ptr).vb[7].vb0.access_type);
    debug_printf("\t\t.vb[7].vb0.vb_index = 0x%x\n", (*ptr).vb[7].vb0.vb_index);
    debug_printf("\t\t.vb[7].start_addr = 0x%x\n", (*ptr).vb[7].start_addr);
    debug_printf("\t\t.vb[7].max_index = 0x%x\n", (*ptr).vb[7].max_index);
    debug_printf("\t\t.vb[7].instance_data_step_rate = 0x%x\n", (*ptr).vb[7].instance_data_step_rate);
    debug_printf("\t\t.vb[8].vb0.pitch = 0x%x\n", (*ptr).vb[8].vb0.pitch);
-   debug_printf("\t\t.vb[8].vb0.pad = 0x%x\n", (*ptr).vb[8].vb0.pad);
    debug_printf("\t\t.vb[8].vb0.access_type = 0x%x\n", (*ptr).vb[8].vb0.access_type);
    debug_printf("\t\t.vb[8].vb0.vb_index = 0x%x\n", (*ptr).vb[8].vb0.vb_index);
    debug_printf("\t\t.vb[8].start_addr = 0x%x\n", (*ptr).vb[8].start_addr);
    debug_printf("\t\t.vb[8].max_index = 0x%x\n", (*ptr).vb[8].max_index);
    debug_printf("\t\t.vb[8].instance_data_step_rate = 0x%x\n", (*ptr).vb[8].instance_data_step_rate);
    debug_printf("\t\t.vb[9].vb0.pitch = 0x%x\n", (*ptr).vb[9].vb0.pitch);
-   debug_printf("\t\t.vb[9].vb0.pad = 0x%x\n", (*ptr).vb[9].vb0.pad);
    debug_printf("\t\t.vb[9].vb0.access_type = 0x%x\n", (*ptr).vb[9].vb0.access_type);
    debug_printf("\t\t.vb[9].vb0.vb_index = 0x%x\n", (*ptr).vb[9].vb0.vb_index);
    debug_printf("\t\t.vb[9].start_addr = 0x%x\n", (*ptr).vb[9].start_addr);
    debug_printf("\t\t.vb[9].max_index = 0x%x\n", (*ptr).vb[9].max_index);
    debug_printf("\t\t.vb[9].instance_data_step_rate = 0x%x\n", (*ptr).vb[9].instance_data_step_rate);
    debug_printf("\t\t.vb[10].vb0.pitch = 0x%x\n", (*ptr).vb[10].vb0.pitch);
-   debug_printf("\t\t.vb[10].vb0.pad = 0x%x\n", (*ptr).vb[10].vb0.pad);
    debug_printf("\t\t.vb[10].vb0.access_type = 0x%x\n", (*ptr).vb[10].vb0.access_type);
    debug_printf("\t\t.vb[10].vb0.vb_index = 0x%x\n", (*ptr).vb[10].vb0.vb_index);
    debug_printf("\t\t.vb[10].start_addr = 0x%x\n", (*ptr).vb[10].start_addr);
    debug_printf("\t\t.vb[10].max_index = 0x%x\n", (*ptr).vb[10].max_index);
    debug_printf("\t\t.vb[10].instance_data_step_rate = 0x%x\n", (*ptr).vb[10].instance_data_step_rate);
    debug_printf("\t\t.vb[11].vb0.pitch = 0x%x\n", (*ptr).vb[11].vb0.pitch);
-   debug_printf("\t\t.vb[11].vb0.pad = 0x%x\n", (*ptr).vb[11].vb0.pad);
    debug_printf("\t\t.vb[11].vb0.access_type = 0x%x\n", (*ptr).vb[11].vb0.access_type);
    debug_printf("\t\t.vb[11].vb0.vb_index = 0x%x\n", (*ptr).vb[11].vb0.vb_index);
    debug_printf("\t\t.vb[11].start_addr = 0x%x\n", (*ptr).vb[11].start_addr);
    debug_printf("\t\t.vb[11].max_index = 0x%x\n", (*ptr).vb[11].max_index);
    debug_printf("\t\t.vb[11].instance_data_step_rate = 0x%x\n", (*ptr).vb[11].instance_data_step_rate);
    debug_printf("\t\t.vb[12].vb0.pitch = 0x%x\n", (*ptr).vb[12].vb0.pitch);
-   debug_printf("\t\t.vb[12].vb0.pad = 0x%x\n", (*ptr).vb[12].vb0.pad);
    debug_printf("\t\t.vb[12].vb0.access_type = 0x%x\n", (*ptr).vb[12].vb0.access_type);
    debug_printf("\t\t.vb[12].vb0.vb_index = 0x%x\n", (*ptr).vb[12].vb0.vb_index);
    debug_printf("\t\t.vb[12].start_addr = 0x%x\n", (*ptr).vb[12].start_addr);
    debug_printf("\t\t.vb[12].max_index = 0x%x\n", (*ptr).vb[12].max_index);
    debug_printf("\t\t.vb[12].instance_data_step_rate = 0x%x\n", (*ptr).vb[12].instance_data_step_rate);
    debug_printf("\t\t.vb[13].vb0.pitch = 0x%x\n", (*ptr).vb[13].vb0.pitch);
-   debug_printf("\t\t.vb[13].vb0.pad = 0x%x\n", (*ptr).vb[13].vb0.pad);
    debug_printf("\t\t.vb[13].vb0.access_type = 0x%x\n", (*ptr).vb[13].vb0.access_type);
    debug_printf("\t\t.vb[13].vb0.vb_index = 0x%x\n", (*ptr).vb[13].vb0.vb_index);
    debug_printf("\t\t.vb[13].start_addr = 0x%x\n", (*ptr).vb[13].start_addr);
    debug_printf("\t\t.vb[13].max_index = 0x%x\n", (*ptr).vb[13].max_index);
    debug_printf("\t\t.vb[13].instance_data_step_rate = 0x%x\n", (*ptr).vb[13].instance_data_step_rate);
    debug_printf("\t\t.vb[14].vb0.pitch = 0x%x\n", (*ptr).vb[14].vb0.pitch);
-   debug_printf("\t\t.vb[14].vb0.pad = 0x%x\n", (*ptr).vb[14].vb0.pad);
    debug_printf("\t\t.vb[14].vb0.access_type = 0x%x\n", (*ptr).vb[14].vb0.access_type);
    debug_printf("\t\t.vb[14].vb0.vb_index = 0x%x\n", (*ptr).vb[14].vb0.vb_index);
    debug_printf("\t\t.vb[14].start_addr = 0x%x\n", (*ptr).vb[14].start_addr);
    debug_printf("\t\t.vb[14].max_index = 0x%x\n", (*ptr).vb[14].max_index);
    debug_printf("\t\t.vb[14].instance_data_step_rate = 0x%x\n", (*ptr).vb[14].instance_data_step_rate);
    debug_printf("\t\t.vb[15].vb0.pitch = 0x%x\n", (*ptr).vb[15].vb0.pitch);
-   debug_printf("\t\t.vb[15].vb0.pad = 0x%x\n", (*ptr).vb[15].vb0.pad);
    debug_printf("\t\t.vb[15].vb0.access_type = 0x%x\n", (*ptr).vb[15].vb0.access_type);
    debug_printf("\t\t.vb[15].vb0.vb_index = 0x%x\n", (*ptr).vb[15].vb0.vb_index);
    debug_printf("\t\t.vb[15].start_addr = 0x%x\n", (*ptr).vb[15].start_addr);
    debug_printf("\t\t.vb[15].max_index = 0x%x\n", (*ptr).vb[15].max_index);
    debug_printf("\t\t.vb[15].instance_data_step_rate = 0x%x\n", (*ptr).vb[15].instance_data_step_rate);
    debug_printf("\t\t.vb[16].vb0.pitch = 0x%x\n", (*ptr).vb[16].vb0.pitch);
-   debug_printf("\t\t.vb[16].vb0.pad = 0x%x\n", (*ptr).vb[16].vb0.pad);
    debug_printf("\t\t.vb[16].vb0.access_type = 0x%x\n", (*ptr).vb[16].vb0.access_type);
    debug_printf("\t\t.vb[16].vb0.vb_index = 0x%x\n", (*ptr).vb[16].vb0.vb_index);
    debug_printf("\t\t.vb[16].start_addr = 0x%x\n", (*ptr).vb[16].start_addr);
@@ -1133,7 +961,6 @@ void
 brw_dump_vertex_buffer_state(const struct brw_vertex_buffer_state *ptr)
 {
    debug_printf("\t\t.vb0.pitch = 0x%x\n", (*ptr).vb0.pitch);
-   debug_printf("\t\t.vb0.pad = 0x%x\n", (*ptr).vb0.pad);
    debug_printf("\t\t.vb0.access_type = 0x%x\n", (*ptr).vb0.access_type);
    debug_printf("\t\t.vb0.vb_index = 0x%x\n", (*ptr).vb0.vb_index);
    debug_printf("\t\t.start_addr = 0x%x\n", (*ptr).start_addr);
@@ -1147,217 +974,163 @@ brw_dump_vertex_element_packet(const struct brw_vertex_element_packet *ptr)
    debug_printf("\t\t.header.length = 0x%x\n", (*ptr).header.length);
    debug_printf("\t\t.header.opcode = 0x%x\n", (*ptr).header.opcode);
    debug_printf("\t\t.ve[0].ve0.src_offset = 0x%x\n", (*ptr).ve[0].ve0.src_offset);
-   debug_printf("\t\t.ve[0].ve0.pad = 0x%x\n", (*ptr).ve[0].ve0.pad);
    debug_printf("\t\t.ve[0].ve0.src_format = 0x%x\n", (*ptr).ve[0].ve0.src_format);
-   debug_printf("\t\t.ve[0].ve0.pad0 = 0x%x\n", (*ptr).ve[0].ve0.pad0);
    debug_printf("\t\t.ve[0].ve0.valid = 0x%x\n", (*ptr).ve[0].ve0.valid);
    debug_printf("\t\t.ve[0].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[0].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[0].ve1.dst_offset = 0x%x\n", (*ptr).ve[0].ve1.dst_offset);
-   debug_printf("\t\t.ve[0].ve1.pad = 0x%x\n", (*ptr).ve[0].ve1.pad);
    debug_printf("\t\t.ve[0].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[0].ve1.vfcomponent3);
    debug_printf("\t\t.ve[0].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[0].ve1.vfcomponent2);
    debug_printf("\t\t.ve[0].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[0].ve1.vfcomponent1);
    debug_printf("\t\t.ve[0].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[0].ve1.vfcomponent0);
    debug_printf("\t\t.ve[1].ve0.src_offset = 0x%x\n", (*ptr).ve[1].ve0.src_offset);
-   debug_printf("\t\t.ve[1].ve0.pad = 0x%x\n", (*ptr).ve[1].ve0.pad);
    debug_printf("\t\t.ve[1].ve0.src_format = 0x%x\n", (*ptr).ve[1].ve0.src_format);
-   debug_printf("\t\t.ve[1].ve0.pad0 = 0x%x\n", (*ptr).ve[1].ve0.pad0);
    debug_printf("\t\t.ve[1].ve0.valid = 0x%x\n", (*ptr).ve[1].ve0.valid);
    debug_printf("\t\t.ve[1].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[1].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[1].ve1.dst_offset = 0x%x\n", (*ptr).ve[1].ve1.dst_offset);
-   debug_printf("\t\t.ve[1].ve1.pad = 0x%x\n", (*ptr).ve[1].ve1.pad);
    debug_printf("\t\t.ve[1].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[1].ve1.vfcomponent3);
    debug_printf("\t\t.ve[1].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[1].ve1.vfcomponent2);
    debug_printf("\t\t.ve[1].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[1].ve1.vfcomponent1);
    debug_printf("\t\t.ve[1].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[1].ve1.vfcomponent0);
    debug_printf("\t\t.ve[2].ve0.src_offset = 0x%x\n", (*ptr).ve[2].ve0.src_offset);
-   debug_printf("\t\t.ve[2].ve0.pad = 0x%x\n", (*ptr).ve[2].ve0.pad);
    debug_printf("\t\t.ve[2].ve0.src_format = 0x%x\n", (*ptr).ve[2].ve0.src_format);
-   debug_printf("\t\t.ve[2].ve0.pad0 = 0x%x\n", (*ptr).ve[2].ve0.pad0);
    debug_printf("\t\t.ve[2].ve0.valid = 0x%x\n", (*ptr).ve[2].ve0.valid);
    debug_printf("\t\t.ve[2].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[2].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[2].ve1.dst_offset = 0x%x\n", (*ptr).ve[2].ve1.dst_offset);
-   debug_printf("\t\t.ve[2].ve1.pad = 0x%x\n", (*ptr).ve[2].ve1.pad);
    debug_printf("\t\t.ve[2].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[2].ve1.vfcomponent3);
    debug_printf("\t\t.ve[2].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[2].ve1.vfcomponent2);
    debug_printf("\t\t.ve[2].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[2].ve1.vfcomponent1);
    debug_printf("\t\t.ve[2].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[2].ve1.vfcomponent0);
    debug_printf("\t\t.ve[3].ve0.src_offset = 0x%x\n", (*ptr).ve[3].ve0.src_offset);
-   debug_printf("\t\t.ve[3].ve0.pad = 0x%x\n", (*ptr).ve[3].ve0.pad);
    debug_printf("\t\t.ve[3].ve0.src_format = 0x%x\n", (*ptr).ve[3].ve0.src_format);
-   debug_printf("\t\t.ve[3].ve0.pad0 = 0x%x\n", (*ptr).ve[3].ve0.pad0);
    debug_printf("\t\t.ve[3].ve0.valid = 0x%x\n", (*ptr).ve[3].ve0.valid);
    debug_printf("\t\t.ve[3].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[3].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[3].ve1.dst_offset = 0x%x\n", (*ptr).ve[3].ve1.dst_offset);
-   debug_printf("\t\t.ve[3].ve1.pad = 0x%x\n", (*ptr).ve[3].ve1.pad);
    debug_printf("\t\t.ve[3].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[3].ve1.vfcomponent3);
    debug_printf("\t\t.ve[3].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[3].ve1.vfcomponent2);
    debug_printf("\t\t.ve[3].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[3].ve1.vfcomponent1);
    debug_printf("\t\t.ve[3].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[3].ve1.vfcomponent0);
    debug_printf("\t\t.ve[4].ve0.src_offset = 0x%x\n", (*ptr).ve[4].ve0.src_offset);
-   debug_printf("\t\t.ve[4].ve0.pad = 0x%x\n", (*ptr).ve[4].ve0.pad);
    debug_printf("\t\t.ve[4].ve0.src_format = 0x%x\n", (*ptr).ve[4].ve0.src_format);
-   debug_printf("\t\t.ve[4].ve0.pad0 = 0x%x\n", (*ptr).ve[4].ve0.pad0);
    debug_printf("\t\t.ve[4].ve0.valid = 0x%x\n", (*ptr).ve[4].ve0.valid);
    debug_printf("\t\t.ve[4].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[4].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[4].ve1.dst_offset = 0x%x\n", (*ptr).ve[4].ve1.dst_offset);
-   debug_printf("\t\t.ve[4].ve1.pad = 0x%x\n", (*ptr).ve[4].ve1.pad);
    debug_printf("\t\t.ve[4].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[4].ve1.vfcomponent3);
    debug_printf("\t\t.ve[4].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[4].ve1.vfcomponent2);
    debug_printf("\t\t.ve[4].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[4].ve1.vfcomponent1);
    debug_printf("\t\t.ve[4].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[4].ve1.vfcomponent0);
    debug_printf("\t\t.ve[5].ve0.src_offset = 0x%x\n", (*ptr).ve[5].ve0.src_offset);
-   debug_printf("\t\t.ve[5].ve0.pad = 0x%x\n", (*ptr).ve[5].ve0.pad);
    debug_printf("\t\t.ve[5].ve0.src_format = 0x%x\n", (*ptr).ve[5].ve0.src_format);
-   debug_printf("\t\t.ve[5].ve0.pad0 = 0x%x\n", (*ptr).ve[5].ve0.pad0);
    debug_printf("\t\t.ve[5].ve0.valid = 0x%x\n", (*ptr).ve[5].ve0.valid);
    debug_printf("\t\t.ve[5].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[5].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[5].ve1.dst_offset = 0x%x\n", (*ptr).ve[5].ve1.dst_offset);
-   debug_printf("\t\t.ve[5].ve1.pad = 0x%x\n", (*ptr).ve[5].ve1.pad);
    debug_printf("\t\t.ve[5].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[5].ve1.vfcomponent3);
    debug_printf("\t\t.ve[5].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[5].ve1.vfcomponent2);
    debug_printf("\t\t.ve[5].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[5].ve1.vfcomponent1);
    debug_printf("\t\t.ve[5].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[5].ve1.vfcomponent0);
    debug_printf("\t\t.ve[6].ve0.src_offset = 0x%x\n", (*ptr).ve[6].ve0.src_offset);
-   debug_printf("\t\t.ve[6].ve0.pad = 0x%x\n", (*ptr).ve[6].ve0.pad);
    debug_printf("\t\t.ve[6].ve0.src_format = 0x%x\n", (*ptr).ve[6].ve0.src_format);
-   debug_printf("\t\t.ve[6].ve0.pad0 = 0x%x\n", (*ptr).ve[6].ve0.pad0);
    debug_printf("\t\t.ve[6].ve0.valid = 0x%x\n", (*ptr).ve[6].ve0.valid);
    debug_printf("\t\t.ve[6].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[6].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[6].ve1.dst_offset = 0x%x\n", (*ptr).ve[6].ve1.dst_offset);
-   debug_printf("\t\t.ve[6].ve1.pad = 0x%x\n", (*ptr).ve[6].ve1.pad);
    debug_printf("\t\t.ve[6].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[6].ve1.vfcomponent3);
    debug_printf("\t\t.ve[6].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[6].ve1.vfcomponent2);
    debug_printf("\t\t.ve[6].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[6].ve1.vfcomponent1);
    debug_printf("\t\t.ve[6].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[6].ve1.vfcomponent0);
    debug_printf("\t\t.ve[7].ve0.src_offset = 0x%x\n", (*ptr).ve[7].ve0.src_offset);
-   debug_printf("\t\t.ve[7].ve0.pad = 0x%x\n", (*ptr).ve[7].ve0.pad);
    debug_printf("\t\t.ve[7].ve0.src_format = 0x%x\n", (*ptr).ve[7].ve0.src_format);
-   debug_printf("\t\t.ve[7].ve0.pad0 = 0x%x\n", (*ptr).ve[7].ve0.pad0);
    debug_printf("\t\t.ve[7].ve0.valid = 0x%x\n", (*ptr).ve[7].ve0.valid);
    debug_printf("\t\t.ve[7].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[7].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[7].ve1.dst_offset = 0x%x\n", (*ptr).ve[7].ve1.dst_offset);
-   debug_printf("\t\t.ve[7].ve1.pad = 0x%x\n", (*ptr).ve[7].ve1.pad);
    debug_printf("\t\t.ve[7].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[7].ve1.vfcomponent3);
    debug_printf("\t\t.ve[7].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[7].ve1.vfcomponent2);
    debug_printf("\t\t.ve[7].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[7].ve1.vfcomponent1);
    debug_printf("\t\t.ve[7].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[7].ve1.vfcomponent0);
    debug_printf("\t\t.ve[8].ve0.src_offset = 0x%x\n", (*ptr).ve[8].ve0.src_offset);
-   debug_printf("\t\t.ve[8].ve0.pad = 0x%x\n", (*ptr).ve[8].ve0.pad);
    debug_printf("\t\t.ve[8].ve0.src_format = 0x%x\n", (*ptr).ve[8].ve0.src_format);
-   debug_printf("\t\t.ve[8].ve0.pad0 = 0x%x\n", (*ptr).ve[8].ve0.pad0);
    debug_printf("\t\t.ve[8].ve0.valid = 0x%x\n", (*ptr).ve[8].ve0.valid);
    debug_printf("\t\t.ve[8].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[8].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[8].ve1.dst_offset = 0x%x\n", (*ptr).ve[8].ve1.dst_offset);
-   debug_printf("\t\t.ve[8].ve1.pad = 0x%x\n", (*ptr).ve[8].ve1.pad);
    debug_printf("\t\t.ve[8].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[8].ve1.vfcomponent3);
    debug_printf("\t\t.ve[8].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[8].ve1.vfcomponent2);
    debug_printf("\t\t.ve[8].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[8].ve1.vfcomponent1);
    debug_printf("\t\t.ve[8].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[8].ve1.vfcomponent0);
    debug_printf("\t\t.ve[9].ve0.src_offset = 0x%x\n", (*ptr).ve[9].ve0.src_offset);
-   debug_printf("\t\t.ve[9].ve0.pad = 0x%x\n", (*ptr).ve[9].ve0.pad);
    debug_printf("\t\t.ve[9].ve0.src_format = 0x%x\n", (*ptr).ve[9].ve0.src_format);
-   debug_printf("\t\t.ve[9].ve0.pad0 = 0x%x\n", (*ptr).ve[9].ve0.pad0);
    debug_printf("\t\t.ve[9].ve0.valid = 0x%x\n", (*ptr).ve[9].ve0.valid);
    debug_printf("\t\t.ve[9].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[9].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[9].ve1.dst_offset = 0x%x\n", (*ptr).ve[9].ve1.dst_offset);
-   debug_printf("\t\t.ve[9].ve1.pad = 0x%x\n", (*ptr).ve[9].ve1.pad);
    debug_printf("\t\t.ve[9].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[9].ve1.vfcomponent3);
    debug_printf("\t\t.ve[9].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[9].ve1.vfcomponent2);
    debug_printf("\t\t.ve[9].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[9].ve1.vfcomponent1);
    debug_printf("\t\t.ve[9].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[9].ve1.vfcomponent0);
    debug_printf("\t\t.ve[10].ve0.src_offset = 0x%x\n", (*ptr).ve[10].ve0.src_offset);
-   debug_printf("\t\t.ve[10].ve0.pad = 0x%x\n", (*ptr).ve[10].ve0.pad);
    debug_printf("\t\t.ve[10].ve0.src_format = 0x%x\n", (*ptr).ve[10].ve0.src_format);
-   debug_printf("\t\t.ve[10].ve0.pad0 = 0x%x\n", (*ptr).ve[10].ve0.pad0);
    debug_printf("\t\t.ve[10].ve0.valid = 0x%x\n", (*ptr).ve[10].ve0.valid);
    debug_printf("\t\t.ve[10].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[10].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[10].ve1.dst_offset = 0x%x\n", (*ptr).ve[10].ve1.dst_offset);
-   debug_printf("\t\t.ve[10].ve1.pad = 0x%x\n", (*ptr).ve[10].ve1.pad);
    debug_printf("\t\t.ve[10].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[10].ve1.vfcomponent3);
    debug_printf("\t\t.ve[10].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[10].ve1.vfcomponent2);
    debug_printf("\t\t.ve[10].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[10].ve1.vfcomponent1);
    debug_printf("\t\t.ve[10].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[10].ve1.vfcomponent0);
    debug_printf("\t\t.ve[11].ve0.src_offset = 0x%x\n", (*ptr).ve[11].ve0.src_offset);
-   debug_printf("\t\t.ve[11].ve0.pad = 0x%x\n", (*ptr).ve[11].ve0.pad);
    debug_printf("\t\t.ve[11].ve0.src_format = 0x%x\n", (*ptr).ve[11].ve0.src_format);
-   debug_printf("\t\t.ve[11].ve0.pad0 = 0x%x\n", (*ptr).ve[11].ve0.pad0);
    debug_printf("\t\t.ve[11].ve0.valid = 0x%x\n", (*ptr).ve[11].ve0.valid);
    debug_printf("\t\t.ve[11].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[11].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[11].ve1.dst_offset = 0x%x\n", (*ptr).ve[11].ve1.dst_offset);
-   debug_printf("\t\t.ve[11].ve1.pad = 0x%x\n", (*ptr).ve[11].ve1.pad);
    debug_printf("\t\t.ve[11].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[11].ve1.vfcomponent3);
    debug_printf("\t\t.ve[11].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[11].ve1.vfcomponent2);
    debug_printf("\t\t.ve[11].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[11].ve1.vfcomponent1);
    debug_printf("\t\t.ve[11].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[11].ve1.vfcomponent0);
    debug_printf("\t\t.ve[12].ve0.src_offset = 0x%x\n", (*ptr).ve[12].ve0.src_offset);
-   debug_printf("\t\t.ve[12].ve0.pad = 0x%x\n", (*ptr).ve[12].ve0.pad);
    debug_printf("\t\t.ve[12].ve0.src_format = 0x%x\n", (*ptr).ve[12].ve0.src_format);
-   debug_printf("\t\t.ve[12].ve0.pad0 = 0x%x\n", (*ptr).ve[12].ve0.pad0);
    debug_printf("\t\t.ve[12].ve0.valid = 0x%x\n", (*ptr).ve[12].ve0.valid);
    debug_printf("\t\t.ve[12].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[12].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[12].ve1.dst_offset = 0x%x\n", (*ptr).ve[12].ve1.dst_offset);
-   debug_printf("\t\t.ve[12].ve1.pad = 0x%x\n", (*ptr).ve[12].ve1.pad);
    debug_printf("\t\t.ve[12].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[12].ve1.vfcomponent3);
    debug_printf("\t\t.ve[12].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[12].ve1.vfcomponent2);
    debug_printf("\t\t.ve[12].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[12].ve1.vfcomponent1);
    debug_printf("\t\t.ve[12].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[12].ve1.vfcomponent0);
    debug_printf("\t\t.ve[13].ve0.src_offset = 0x%x\n", (*ptr).ve[13].ve0.src_offset);
-   debug_printf("\t\t.ve[13].ve0.pad = 0x%x\n", (*ptr).ve[13].ve0.pad);
    debug_printf("\t\t.ve[13].ve0.src_format = 0x%x\n", (*ptr).ve[13].ve0.src_format);
-   debug_printf("\t\t.ve[13].ve0.pad0 = 0x%x\n", (*ptr).ve[13].ve0.pad0);
    debug_printf("\t\t.ve[13].ve0.valid = 0x%x\n", (*ptr).ve[13].ve0.valid);
    debug_printf("\t\t.ve[13].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[13].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[13].ve1.dst_offset = 0x%x\n", (*ptr).ve[13].ve1.dst_offset);
-   debug_printf("\t\t.ve[13].ve1.pad = 0x%x\n", (*ptr).ve[13].ve1.pad);
    debug_printf("\t\t.ve[13].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[13].ve1.vfcomponent3);
    debug_printf("\t\t.ve[13].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[13].ve1.vfcomponent2);
    debug_printf("\t\t.ve[13].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[13].ve1.vfcomponent1);
    debug_printf("\t\t.ve[13].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[13].ve1.vfcomponent0);
    debug_printf("\t\t.ve[14].ve0.src_offset = 0x%x\n", (*ptr).ve[14].ve0.src_offset);
-   debug_printf("\t\t.ve[14].ve0.pad = 0x%x\n", (*ptr).ve[14].ve0.pad);
    debug_printf("\t\t.ve[14].ve0.src_format = 0x%x\n", (*ptr).ve[14].ve0.src_format);
-   debug_printf("\t\t.ve[14].ve0.pad0 = 0x%x\n", (*ptr).ve[14].ve0.pad0);
    debug_printf("\t\t.ve[14].ve0.valid = 0x%x\n", (*ptr).ve[14].ve0.valid);
    debug_printf("\t\t.ve[14].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[14].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[14].ve1.dst_offset = 0x%x\n", (*ptr).ve[14].ve1.dst_offset);
-   debug_printf("\t\t.ve[14].ve1.pad = 0x%x\n", (*ptr).ve[14].ve1.pad);
    debug_printf("\t\t.ve[14].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[14].ve1.vfcomponent3);
    debug_printf("\t\t.ve[14].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[14].ve1.vfcomponent2);
    debug_printf("\t\t.ve[14].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[14].ve1.vfcomponent1);
    debug_printf("\t\t.ve[14].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[14].ve1.vfcomponent0);
    debug_printf("\t\t.ve[15].ve0.src_offset = 0x%x\n", (*ptr).ve[15].ve0.src_offset);
-   debug_printf("\t\t.ve[15].ve0.pad = 0x%x\n", (*ptr).ve[15].ve0.pad);
    debug_printf("\t\t.ve[15].ve0.src_format = 0x%x\n", (*ptr).ve[15].ve0.src_format);
-   debug_printf("\t\t.ve[15].ve0.pad0 = 0x%x\n", (*ptr).ve[15].ve0.pad0);
    debug_printf("\t\t.ve[15].ve0.valid = 0x%x\n", (*ptr).ve[15].ve0.valid);
    debug_printf("\t\t.ve[15].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[15].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[15].ve1.dst_offset = 0x%x\n", (*ptr).ve[15].ve1.dst_offset);
-   debug_printf("\t\t.ve[15].ve1.pad = 0x%x\n", (*ptr).ve[15].ve1.pad);
    debug_printf("\t\t.ve[15].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[15].ve1.vfcomponent3);
    debug_printf("\t\t.ve[15].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[15].ve1.vfcomponent2);
    debug_printf("\t\t.ve[15].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[15].ve1.vfcomponent1);
    debug_printf("\t\t.ve[15].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[15].ve1.vfcomponent0);
    debug_printf("\t\t.ve[16].ve0.src_offset = 0x%x\n", (*ptr).ve[16].ve0.src_offset);
-   debug_printf("\t\t.ve[16].ve0.pad = 0x%x\n", (*ptr).ve[16].ve0.pad);
    debug_printf("\t\t.ve[16].ve0.src_format = 0x%x\n", (*ptr).ve[16].ve0.src_format);
-   debug_printf("\t\t.ve[16].ve0.pad0 = 0x%x\n", (*ptr).ve[16].ve0.pad0);
    debug_printf("\t\t.ve[16].ve0.valid = 0x%x\n", (*ptr).ve[16].ve0.valid);
    debug_printf("\t\t.ve[16].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[16].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[16].ve1.dst_offset = 0x%x\n", (*ptr).ve[16].ve1.dst_offset);
-   debug_printf("\t\t.ve[16].ve1.pad = 0x%x\n", (*ptr).ve[16].ve1.pad);
    debug_printf("\t\t.ve[16].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[16].ve1.vfcomponent3);
    debug_printf("\t\t.ve[16].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[16].ve1.vfcomponent2);
    debug_printf("\t\t.ve[16].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[16].ve1.vfcomponent1);
    debug_printf("\t\t.ve[16].ve1.vfcomponent0 = 0x%x\n", (*ptr).ve[16].ve1.vfcomponent0);
    debug_printf("\t\t.ve[17].ve0.src_offset = 0x%x\n", (*ptr).ve[17].ve0.src_offset);
-   debug_printf("\t\t.ve[17].ve0.pad = 0x%x\n", (*ptr).ve[17].ve0.pad);
    debug_printf("\t\t.ve[17].ve0.src_format = 0x%x\n", (*ptr).ve[17].ve0.src_format);
-   debug_printf("\t\t.ve[17].ve0.pad0 = 0x%x\n", (*ptr).ve[17].ve0.pad0);
    debug_printf("\t\t.ve[17].ve0.valid = 0x%x\n", (*ptr).ve[17].ve0.valid);
    debug_printf("\t\t.ve[17].ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve[17].ve0.vertex_buffer_index);
    debug_printf("\t\t.ve[17].ve1.dst_offset = 0x%x\n", (*ptr).ve[17].ve1.dst_offset);
-   debug_printf("\t\t.ve[17].ve1.pad = 0x%x\n", (*ptr).ve[17].ve1.pad);
    debug_printf("\t\t.ve[17].ve1.vfcomponent3 = 0x%x\n", (*ptr).ve[17].ve1.vfcomponent3);
    debug_printf("\t\t.ve[17].ve1.vfcomponent2 = 0x%x\n", (*ptr).ve[17].ve1.vfcomponent2);
    debug_printf("\t\t.ve[17].ve1.vfcomponent1 = 0x%x\n", (*ptr).ve[17].ve1.vfcomponent1);
@@ -1368,13 +1141,10 @@ void
 brw_dump_vertex_element_state(const struct brw_vertex_element_state *ptr)
 {
    debug_printf("\t\t.ve0.src_offset = 0x%x\n", (*ptr).ve0.src_offset);
-   debug_printf("\t\t.ve0.pad = 0x%x\n", (*ptr).ve0.pad);
    debug_printf("\t\t.ve0.src_format = 0x%x\n", (*ptr).ve0.src_format);
-   debug_printf("\t\t.ve0.pad0 = 0x%x\n", (*ptr).ve0.pad0);
    debug_printf("\t\t.ve0.valid = 0x%x\n", (*ptr).ve0.valid);
    debug_printf("\t\t.ve0.vertex_buffer_index = 0x%x\n", (*ptr).ve0.vertex_buffer_index);
    debug_printf("\t\t.ve1.dst_offset = 0x%x\n", (*ptr).ve1.dst_offset);
-   debug_printf("\t\t.ve1.pad = 0x%x\n", (*ptr).ve1.pad);
    debug_printf("\t\t.ve1.vfcomponent3 = 0x%x\n", (*ptr).ve1.vfcomponent3);
    debug_printf("\t\t.ve1.vfcomponent2 = 0x%x\n", (*ptr).ve1.vfcomponent2);
    debug_printf("\t\t.ve1.vfcomponent1 = 0x%x\n", (*ptr).ve1.vfcomponent1);
@@ -1385,90 +1155,63 @@ void
 brw_dump_vf_statistics(const struct brw_vf_statistics *ptr)
 {
    debug_printf("\t\t.statistics_enable = 0x%x\n", (*ptr).statistics_enable);
-   debug_printf("\t\t.pad = 0x%x\n", (*ptr).pad);
    debug_printf("\t\t.opcode = 0x%x\n", (*ptr).opcode);
 }
 
 void
 brw_dump_vs_unit_state(const struct brw_vs_unit_state *ptr)
 {
-   debug_printf("\t\t.thread0.pad0 = 0x%x\n", (*ptr).thread0.pad0);
    debug_printf("\t\t.thread0.grf_reg_count = 0x%x\n", (*ptr).thread0.grf_reg_count);
-   debug_printf("\t\t.thread0.pad1 = 0x%x\n", (*ptr).thread0.pad1);
    debug_printf("\t\t.thread0.kernel_start_pointer = 0x%x\n", (*ptr).thread0.kernel_start_pointer);
    debug_printf("\t\t.thread1.ext_halt_exception_enable = 0x%x\n", (*ptr).thread1.ext_halt_exception_enable);
    debug_printf("\t\t.thread1.sw_exception_enable = 0x%x\n", (*ptr).thread1.sw_exception_enable);
    debug_printf("\t\t.thread1.mask_stack_exception_enable = 0x%x\n", (*ptr).thread1.mask_stack_exception_enable);
    debug_printf("\t\t.thread1.timeout_exception_enable = 0x%x\n", (*ptr).thread1.timeout_exception_enable);
    debug_printf("\t\t.thread1.illegal_op_exception_enable = 0x%x\n", (*ptr).thread1.illegal_op_exception_enable);
-   debug_printf("\t\t.thread1.pad0 = 0x%x\n", (*ptr).thread1.pad0);
    debug_printf("\t\t.thread1.depth_coef_urb_read_offset = 0x%x\n", (*ptr).thread1.depth_coef_urb_read_offset);
-   debug_printf("\t\t.thread1.pad1 = 0x%x\n", (*ptr).thread1.pad1);
    debug_printf("\t\t.thread1.floating_point_mode = 0x%x\n", (*ptr).thread1.floating_point_mode);
    debug_printf("\t\t.thread1.thread_priority = 0x%x\n", (*ptr).thread1.thread_priority);
    debug_printf("\t\t.thread1.binding_table_entry_count = 0x%x\n", (*ptr).thread1.binding_table_entry_count);
-   debug_printf("\t\t.thread1.pad3 = 0x%x\n", (*ptr).thread1.pad3);
    debug_printf("\t\t.thread1.single_program_flow = 0x%x\n", (*ptr).thread1.single_program_flow);
    debug_printf("\t\t.thread2.per_thread_scratch_space = 0x%x\n", (*ptr).thread2.per_thread_scratch_space);
-   debug_printf("\t\t.thread2.pad0 = 0x%x\n", (*ptr).thread2.pad0);
    debug_printf("\t\t.thread2.scratch_space_base_pointer = 0x%x\n", (*ptr).thread2.scratch_space_base_pointer);
    debug_printf("\t\t.thread3.dispatch_grf_start_reg = 0x%x\n", (*ptr).thread3.dispatch_grf_start_reg);
    debug_printf("\t\t.thread3.urb_entry_read_offset = 0x%x\n", (*ptr).thread3.urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad0 = 0x%x\n", (*ptr).thread3.pad0);
    debug_printf("\t\t.thread3.urb_entry_read_length = 0x%x\n", (*ptr).thread3.urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad1 = 0x%x\n", (*ptr).thread3.pad1);
    debug_printf("\t\t.thread3.const_urb_entry_read_offset = 0x%x\n", (*ptr).thread3.const_urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad2 = 0x%x\n", (*ptr).thread3.pad2);
    debug_printf("\t\t.thread3.const_urb_entry_read_length = 0x%x\n", (*ptr).thread3.const_urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad3 = 0x%x\n", (*ptr).thread3.pad3);
-   debug_printf("\t\t.thread4.pad0 = 0x%x\n", (*ptr).thread4.pad0);
    debug_printf("\t\t.thread4.stats_enable = 0x%x\n", (*ptr).thread4.stats_enable);
    debug_printf("\t\t.thread4.nr_urb_entries = 0x%x\n", (*ptr).thread4.nr_urb_entries);
-   debug_printf("\t\t.thread4.pad1 = 0x%x\n", (*ptr).thread4.pad1);
    debug_printf("\t\t.thread4.urb_entry_allocation_size = 0x%x\n", (*ptr).thread4.urb_entry_allocation_size);
-   debug_printf("\t\t.thread4.pad2 = 0x%x\n", (*ptr).thread4.pad2);
    debug_printf("\t\t.thread4.max_threads = 0x%x\n", (*ptr).thread4.max_threads);
-   debug_printf("\t\t.thread4.pad3 = 0x%x\n", (*ptr).thread4.pad3);
    debug_printf("\t\t.vs5.sampler_count = 0x%x\n", (*ptr).vs5.sampler_count);
-   debug_printf("\t\t.vs5.pad0 = 0x%x\n", (*ptr).vs5.pad0);
    debug_printf("\t\t.vs5.sampler_state_pointer = 0x%x\n", (*ptr).vs5.sampler_state_pointer);
    debug_printf("\t\t.vs6.vs_enable = 0x%x\n", (*ptr).vs6.vs_enable);
    debug_printf("\t\t.vs6.vert_cache_disable = 0x%x\n", (*ptr).vs6.vert_cache_disable);
-   debug_printf("\t\t.vs6.pad0 = 0x%x\n", (*ptr).vs6.pad0);
 }
 
 void
 brw_dump_wm_unit_state(const struct brw_wm_unit_state *ptr)
 {
-   debug_printf("\t\t.thread0.pad0 = 0x%x\n", (*ptr).thread0.pad0);
    debug_printf("\t\t.thread0.grf_reg_count = 0x%x\n", (*ptr).thread0.grf_reg_count);
-   debug_printf("\t\t.thread0.pad1 = 0x%x\n", (*ptr).thread0.pad1);
    debug_printf("\t\t.thread0.kernel_start_pointer = 0x%x\n", (*ptr).thread0.kernel_start_pointer);
    debug_printf("\t\t.thread1.ext_halt_exception_enable = 0x%x\n", (*ptr).thread1.ext_halt_exception_enable);
    debug_printf("\t\t.thread1.sw_exception_enable = 0x%x\n", (*ptr).thread1.sw_exception_enable);
    debug_printf("\t\t.thread1.mask_stack_exception_enable = 0x%x\n", (*ptr).thread1.mask_stack_exception_enable);
    debug_printf("\t\t.thread1.timeout_exception_enable = 0x%x\n", (*ptr).thread1.timeout_exception_enable);
    debug_printf("\t\t.thread1.illegal_op_exception_enable = 0x%x\n", (*ptr).thread1.illegal_op_exception_enable);
-   debug_printf("\t\t.thread1.pad0 = 0x%x\n", (*ptr).thread1.pad0);
    debug_printf("\t\t.thread1.depth_coef_urb_read_offset = 0x%x\n", (*ptr).thread1.depth_coef_urb_read_offset);
-   debug_printf("\t\t.thread1.pad1 = 0x%x\n", (*ptr).thread1.pad1);
    debug_printf("\t\t.thread1.floating_point_mode = 0x%x\n", (*ptr).thread1.floating_point_mode);
    debug_printf("\t\t.thread1.thread_priority = 0x%x\n", (*ptr).thread1.thread_priority);
    debug_printf("\t\t.thread1.binding_table_entry_count = 0x%x\n", (*ptr).thread1.binding_table_entry_count);
-   debug_printf("\t\t.thread1.pad3 = 0x%x\n", (*ptr).thread1.pad3);
    debug_printf("\t\t.thread1.single_program_flow = 0x%x\n", (*ptr).thread1.single_program_flow);
    debug_printf("\t\t.thread2.per_thread_scratch_space = 0x%x\n", (*ptr).thread2.per_thread_scratch_space);
-   debug_printf("\t\t.thread2.pad0 = 0x%x\n", (*ptr).thread2.pad0);
    debug_printf("\t\t.thread2.scratch_space_base_pointer = 0x%x\n", (*ptr).thread2.scratch_space_base_pointer);
    debug_printf("\t\t.thread3.dispatch_grf_start_reg = 0x%x\n", (*ptr).thread3.dispatch_grf_start_reg);
    debug_printf("\t\t.thread3.urb_entry_read_offset = 0x%x\n", (*ptr).thread3.urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad0 = 0x%x\n", (*ptr).thread3.pad0);
    debug_printf("\t\t.thread3.urb_entry_read_length = 0x%x\n", (*ptr).thread3.urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad1 = 0x%x\n", (*ptr).thread3.pad1);
    debug_printf("\t\t.thread3.const_urb_entry_read_offset = 0x%x\n", (*ptr).thread3.const_urb_entry_read_offset);
-   debug_printf("\t\t.thread3.pad2 = 0x%x\n", (*ptr).thread3.pad2);
    debug_printf("\t\t.thread3.const_urb_entry_read_length = 0x%x\n", (*ptr).thread3.const_urb_entry_read_length);
-   debug_printf("\t\t.thread3.pad3 = 0x%x\n", (*ptr).thread3.pad3);
    debug_printf("\t\t.wm4.stats_enable = 0x%x\n", (*ptr).wm4.stats_enable);
    debug_printf("\t\t.wm4.depth_buffer_clear = 0x%x\n", (*ptr).wm4.depth_buffer_clear);
    debug_printf("\t\t.wm4.sampler_count = 0x%x\n", (*ptr).wm4.sampler_count);
@@ -1478,7 +1221,6 @@ brw_dump_wm_unit_state(const struct brw_wm_unit_state *ptr)
    debug_printf("\t\t.wm5.enable_32_pix = 0x%x\n", (*ptr).wm5.enable_32_pix);
    debug_printf("\t\t.wm5.enable_con_32_pix = 0x%x\n", (*ptr).wm5.enable_con_32_pix);
    debug_printf("\t\t.wm5.enable_con_64_pix = 0x%x\n", (*ptr).wm5.enable_con_64_pix);
-   debug_printf("\t\t.wm5.pad0 = 0x%x\n", (*ptr).wm5.pad0);
    debug_printf("\t\t.wm5.legacy_global_depth_bias = 0x%x\n", (*ptr).wm5.legacy_global_depth_bias);
    debug_printf("\t\t.wm5.line_stipple = 0x%x\n", (*ptr).wm5.line_stipple);
    debug_printf("\t\t.wm5.depth_offset = 0x%x\n", (*ptr).wm5.depth_offset);
@@ -1495,17 +1237,11 @@ brw_dump_wm_unit_state(const struct brw_wm_unit_state *ptr)
    debug_printf("\t\t.wm5.max_threads = 0x%x\n", (*ptr).wm5.max_threads);
    debug_printf("\t\t.global_depth_offset_constant = %f\n", (*ptr).global_depth_offset_constant);
    debug_printf("\t\t.global_depth_offset_scale = %f\n", (*ptr).global_depth_offset_scale);
-   debug_printf("\t\t.wm8.pad0 = 0x%x\n", (*ptr).wm8.pad0);
    debug_printf("\t\t.wm8.grf_reg_count_1 = 0x%x\n", (*ptr).wm8.grf_reg_count_1);
-   debug_printf("\t\t.wm8.pad1 = 0x%x\n", (*ptr).wm8.pad1);
    debug_printf("\t\t.wm8.kernel_start_pointer_1 = 0x%x\n", (*ptr).wm8.kernel_start_pointer_1);
-   debug_printf("\t\t.wm9.pad0 = 0x%x\n", (*ptr).wm9.pad0);
    debug_printf("\t\t.wm9.grf_reg_count_2 = 0x%x\n", (*ptr).wm9.grf_reg_count_2);
-   debug_printf("\t\t.wm9.pad1 = 0x%x\n", (*ptr).wm9.pad1);
    debug_printf("\t\t.wm9.kernel_start_pointer_2 = 0x%x\n", (*ptr).wm9.kernel_start_pointer_2);
-   debug_printf("\t\t.wm10.pad0 = 0x%x\n", (*ptr).wm10.pad0);
    debug_printf("\t\t.wm10.grf_reg_count_3 = 0x%x\n", (*ptr).wm10.grf_reg_count_3);
-   debug_printf("\t\t.wm10.pad1 = 0x%x\n", (*ptr).wm10.pad1);
    debug_printf("\t\t.wm10.kernel_start_pointer_3 = 0x%x\n", (*ptr).wm10.kernel_start_pointer_3);
 }
 
diff --git a/src/gallium/drivers/i965/brw_structs_dump.py b/src/gallium/drivers/i965/brw_structs_dump.py
index 581515878e..6dba49ad91 100755
--- a/src/gallium/drivers/i965/brw_structs_dump.py
+++ b/src/gallium/drivers/i965/brw_structs_dump.py
@@ -40,6 +40,7 @@ copyright = '''
 
 import os
 import sys
+import re
 
 from pygccxml import parser
 from pygccxml import declarations
@@ -53,6 +54,11 @@ from pygccxml.declarations import type_visitor
 enums = True
 
 
+def vars_filter(variable):
+    name = variable.name
+    return not re.match('^pad\d*', name) and name != 'dword' 
+
+
 class decl_dumper_t(decl_visitor.decl_visitor_t):
 
     def __init__(self, stream, instance = '', decl = None):
@@ -69,7 +75,8 @@ class decl_dumper_t(decl_visitor.decl_visitor_t):
         assert self.decl.class_type in ('struct', 'union')
 
         for variable in class_.variables(recursive = False):
-            dump_type(self.stream, self._instance + '.' + variable.name, variable.type)
+            if vars_filter(variable):
+                dump_type(self.stream, self._instance + '.' + variable.name, variable.type)
 
     def visit_enumeration(self):
         if enums: