diff --git a/assembler/brw_structs.h b/assembler/brw_structs.h
index 218f11e..db7a9be 100644
--- a/assembler/brw_structs.h
+++ b/assembler/brw_structs.h
@@ -2,7 +2,7 @@
  Copyright (C) Intel Corp.  2006.  All Rights Reserved.
  Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
  develop this 3D driver.
- 
+
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
  distribute, sublicense, and/or sell copies of the Software, and to
  permit persons to whom the Software is furnished to do so, subject to
  the following conditions:
- 
+
  The above copyright notice and this permission notice (including the
  next paragraph) shall be included in all copies or substantial
  portions of the Software.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -22,13 +22,13 @@
  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
+
  **********************************************************************/
  /*
   * Authors:
   *   Keith Whitwell <keith@tungstengraphics.com>
   */
-        
+
 
 #ifndef BRW_STRUCTS_H
 #define BRW_STRUCTS_H
@@ -45,30 +45,30 @@ struct brw_urb_fence
 {
    struct
    {
-      GLuint length:8;   
-      GLuint vs_realloc:1;   
-      GLuint gs_realloc:1;   
-      GLuint clp_realloc:1;   
-      GLuint sf_realloc:1;   
-      GLuint vfe_realloc:1;   
-      GLuint cs_realloc:1;   
+      GLuint length:8;
+      GLuint vs_realloc:1;
+      GLuint gs_realloc:1;
+      GLuint clp_realloc:1;
+      GLuint sf_realloc:1;
+      GLuint vfe_realloc:1;
+      GLuint cs_realloc:1;
       GLuint pad:2;
-      GLuint opcode:16;   
+      GLuint opcode:16;
    } header;
 
    struct
    {
-      GLuint vs_fence:10;  
-      GLuint gs_fence:10;  
-      GLuint clp_fence:10;  
+      GLuint vs_fence:10;
+      GLuint gs_fence:10;
+      GLuint clp_fence:10;
       GLuint pad:2;
    } bits0;
 
    struct
    {
-      GLuint sf_fence:10;  
-      GLuint vf_fence:10;  
-      GLuint cs_fence:11;  
+      GLuint sf_fence:10;
+      GLuint vf_fence:10;
+      GLuint cs_fence:11;
       GLuint pad:1;
    } bits1;
 };
@@ -80,46 +80,46 @@ struct brw_urb_fence
 struct thread0
 {
    GLuint pad0:1;
-   GLuint grf_reg_count:3; 
+   GLuint grf_reg_count:3;
    GLuint pad1:2;
    GLuint kernel_start_pointer:26; /* Offset from GENERAL_STATE_BASE */
 };
 
 struct thread1
 {
-   GLuint ext_halt_exception_enable:1; 
-   GLuint sw_exception_enable:1; 
-   GLuint mask_stack_exception_enable:1; 
-   GLuint timeout_exception_enable:1; 
-   GLuint illegal_op_exception_enable:1; 
+   GLuint ext_halt_exception_enable:1;
+   GLuint sw_exception_enable:1;
+   GLuint mask_stack_exception_enable:1;
+   GLuint timeout_exception_enable:1;
+   GLuint illegal_op_exception_enable:1;
    GLuint pad0:3;
    GLuint depth_coef_urb_read_offset:6;	/* WM only */
    GLuint pad1:2;
-   GLuint floating_point_mode:1; 
-   GLuint thread_priority:1; 
-   GLuint binding_table_entry_count:8; 
+   GLuint floating_point_mode:1;
+   GLuint thread_priority:1;
+   GLuint binding_table_entry_count:8;
    GLuint pad3:5;
-   GLuint single_program_flow:1; 
+   GLuint single_program_flow:1;
 };
 
 struct thread2
 {
-   GLuint per_thread_scratch_space:4; 
+   GLuint per_thread_scratch_space:4;
    GLuint pad0:6;
-   GLuint scratch_space_base_pointer:22; 
+   GLuint scratch_space_base_pointer:22;
 };
 
-   
+
 struct thread3
 {
-   GLuint dispatch_grf_start_reg:4; 
-   GLuint urb_entry_read_offset:6; 
+   GLuint dispatch_grf_start_reg:4;
+   GLuint urb_entry_read_offset:6;
    GLuint pad0:1;
-   GLuint urb_entry_read_length:6; 
+   GLuint urb_entry_read_length:6;
    GLuint pad1:1;
-   GLuint const_urb_entry_read_offset:6; 
+   GLuint const_urb_entry_read_offset:6;
    GLuint pad2:1;
-   GLuint const_urb_entry_read_length:6; 
+   GLuint const_urb_entry_read_length:6;
    GLuint pad3:1;
 };
 
@@ -151,41 +151,41 @@ struct brw_clip_unit_state
    {
       GLuint pad0:9;
       GLuint gs_output_stats:1; /* not always */
-      GLuint stats_enable:1; 
-      GLuint nr_urb_entries:7; 
+      GLuint stats_enable:1;
+      GLuint nr_urb_entries:7;
       GLuint pad1:1;
-      GLuint urb_entry_allocation_size:5; 
+      GLuint urb_entry_allocation_size:5;
       GLuint pad2:1;
       GLuint max_threads:5; 	/* may be less */
       GLuint pad3:2;
-   } thread4;   
-      
+   } thread4;
+
    struct
    {
       GLuint pad0:13;
-      GLuint clip_mode:3; 
-      GLuint userclip_enable_flags:8; 
-      GLuint userclip_must_clip:1; 
+      GLuint clip_mode:3;
+      GLuint userclip_enable_flags:8;
+      GLuint userclip_must_clip:1;
       GLuint negative_w_clip_test:1;
-      GLuint guard_band_enable:1; 
-      GLuint viewport_z_clip_enable:1; 
-      GLuint viewport_xy_clip_enable:1; 
-      GLuint vertex_position_space:1; 
-      GLuint api_mode:1; 
+      GLuint guard_band_enable:1;
+      GLuint viewport_z_clip_enable:1;
+      GLuint viewport_xy_clip_enable:1;
+      GLuint vertex_position_space:1;
+      GLuint api_mode:1;
       GLuint pad2:1;
    } clip5;
-   
+
    struct
    {
       GLuint pad0:5;
-      GLuint clipper_viewport_state_ptr:27; 
+      GLuint clipper_viewport_state_ptr:27;
    } clip6;
 
-   
-   GLfloat viewport_xmin;  
-   GLfloat viewport_xmax;  
-   GLfloat viewport_ymin;  
-   GLfloat viewport_ymax;  
+
+   GLfloat viewport_xmin;
+   GLfloat viewport_xmax;
+   GLfloat viewport_ymin;
+   GLfloat viewport_ymax;
 };
 
 struct gen6_blend_state
@@ -293,88 +293,88 @@ struct brw_cc_unit_state
    struct
    {
       GLuint pad0:3;
-      GLuint bf_stencil_pass_depth_pass_op:3; 
-      GLuint bf_stencil_pass_depth_fail_op:3; 
-      GLuint bf_stencil_fail_op:3; 
-      GLuint bf_stencil_func:3; 
-      GLuint bf_stencil_enable:1; 
+      GLuint bf_stencil_pass_depth_pass_op:3;
+      GLuint bf_stencil_pass_depth_fail_op:3;
+      GLuint bf_stencil_fail_op:3;
+      GLuint bf_stencil_func:3;
+      GLuint bf_stencil_enable:1;
       GLuint pad1:2;
-      GLuint stencil_write_enable:1; 
-      GLuint stencil_pass_depth_pass_op:3; 
-      GLuint stencil_pass_depth_fail_op:3; 
-      GLuint stencil_fail_op:3; 
-      GLuint stencil_func:3; 
-      GLuint stencil_enable:1; 
+      GLuint stencil_write_enable:1;
+      GLuint stencil_pass_depth_pass_op:3;
+      GLuint stencil_pass_depth_fail_op:3;
+      GLuint stencil_fail_op:3;
+      GLuint stencil_func:3;
+      GLuint stencil_enable:1;
    } cc0;
 
-   
+
    struct
    {
-      GLuint bf_stencil_ref:8; 
-      GLuint stencil_write_mask:8; 
-      GLuint stencil_test_mask:8; 
-      GLuint stencil_ref:8; 
+      GLuint bf_stencil_ref:8;
+      GLuint stencil_write_mask:8;
+      GLuint stencil_test_mask:8;
+      GLuint stencil_ref:8;
    } cc1;
 
-   
+
    struct
    {
-      GLuint logicop_enable:1; 
+      GLuint logicop_enable:1;
       GLuint pad0:10;
-      GLuint depth_write_enable:1; 
-      GLuint depth_test_function:3; 
-      GLuint depth_test:1; 
-      GLuint bf_stencil_write_mask:8; 
-      GLuint bf_stencil_test_mask:8; 
+      GLuint depth_write_enable:1;
+      GLuint depth_test_function:3;
+      GLuint depth_test:1;
+      GLuint bf_stencil_write_mask:8;
+      GLuint bf_stencil_test_mask:8;
    } cc2;
 
-   
+
    struct
    {
       GLuint pad0:8;
-      GLuint alpha_test_func:3; 
-      GLuint alpha_test:1; 
-      GLuint blend_enable:1; 
-      GLuint ia_blend_enable:1; 
+      GLuint alpha_test_func:3;
+      GLuint alpha_test:1;
+      GLuint blend_enable:1;
+      GLuint ia_blend_enable:1;
       GLuint pad1:1;
       GLuint alpha_test_format:1;
       GLuint pad2:16;
    } cc3;
-   
+
    struct
    {
-      GLuint pad0:5; 
+      GLuint pad0:5;
       GLuint cc_viewport_state_offset:27; /* Offset from GENERAL_STATE_BASE */
    } cc4;
-   
+
    struct
    {
       GLuint pad0:2;
-      GLuint ia_dest_blend_factor:5; 
-      GLuint ia_src_blend_factor:5; 
-      GLuint ia_blend_function:3; 
-      GLuint statistics_enable:1; 
-      GLuint logicop_func:4; 
+      GLuint ia_dest_blend_factor:5;
+      GLuint ia_src_blend_factor:5;
+      GLuint ia_blend_function:3;
+      GLuint statistics_enable:1;
+      GLuint logicop_func:4;
       GLuint pad1:11;
-      GLuint dither_enable:1; 
+      GLuint dither_enable:1;
    } cc5;
 
    struct
    {
-      GLuint clamp_post_alpha_blend:1; 
-      GLuint clamp_pre_alpha_blend:1; 
-      GLuint clamp_range:2; 
+      GLuint clamp_post_alpha_blend:1;
+      GLuint clamp_pre_alpha_blend:1;
+      GLuint clamp_range:2;
       GLuint pad0:11;
-      GLuint y_dither_offset:2; 
-      GLuint x_dither_offset:2; 
-      GLuint dest_blend_factor:5; 
-      GLuint src_blend_factor:5; 
-      GLuint blend_function:3; 
+      GLuint y_dither_offset:2;
+      GLuint x_dither_offset:2;
+      GLuint dest_blend_factor:5;
+      GLuint src_blend_factor:5;
+      GLuint blend_function:3;
    } cc6;
 
    struct {
       union {
-	 GLfloat f;  
+	 GLfloat f;
 	 GLubyte ub[4];
       } alpha_ref;
    } cc7;
@@ -390,51 +390,51 @@ struct brw_sf_unit_state
    struct
    {
       GLuint pad0:10;
-      GLuint stats_enable:1; 
-      GLuint nr_urb_entries:7; 
+      GLuint stats_enable:1;
+      GLuint nr_urb_entries:7;
       GLuint pad1:1;
-      GLuint urb_entry_allocation_size:5; 
+      GLuint urb_entry_allocation_size:5;
       GLuint pad2:1;
-      GLuint max_threads:6; 
+      GLuint max_threads:6;
       GLuint pad3:1;
-   } thread4;   
+   } thread4;
 
    struct
    {
-      GLuint front_winding:1; 
-      GLuint viewport_transform:1; 
+      GLuint front_winding:1;
+      GLuint viewport_transform:1;
       GLuint pad0:3;
       GLuint sf_viewport_state_offset:27; /* Offset from GENERAL_STATE_BASE */
    } sf5;
-   
+
    struct
    {
       GLuint pad0:9;
-      GLuint dest_org_vbias:4; 
-      GLuint dest_org_hbias:4; 
-      GLuint scissor:1; 
-      GLuint disable_2x2_trifilter:1; 
-      GLuint disable_zero_pix_trifilter:1; 
-      GLuint point_rast_rule:2; 
-      GLuint line_endcap_aa_region_width:2; 
-      GLuint line_width:4; 
-      GLuint fast_scissor_disable:1; 
-      GLuint cull_mode:2; 
-      GLuint aa_enable:1; 
+      GLuint dest_org_vbias:4;
+      GLuint dest_org_hbias:4;
+      GLuint scissor:1;
+      GLuint disable_2x2_trifilter:1;
+      GLuint disable_zero_pix_trifilter:1;
+      GLuint point_rast_rule:2;
+      GLuint line_endcap_aa_region_width:2;
+      GLuint line_width:4;
+      GLuint fast_scissor_disable:1;
+      GLuint cull_mode:2;
+      GLuint aa_enable:1;
    } sf6;
 
    struct
    {
-      GLuint point_size:11; 
-      GLuint use_point_size_state:1; 
-      GLuint subpixel_precision:1; 
-      GLuint sprite_point:1; 
+      GLuint point_size:11;
+      GLuint use_point_size_state:1;
+      GLuint subpixel_precision:1;
+      GLuint sprite_point:1;
       GLuint pad0:10;
       GLuint aa_line_distance_mode:1;
-      GLuint trifan_pv:2; 
-      GLuint linestrip_pv:2; 
-      GLuint tristrip_pv:2; 
-      GLuint line_last_pixel_enable:1; 
+      GLuint trifan_pv:2;
+      GLuint linestrip_pv:2;
+      GLuint tristrip_pv:2;
+      GLuint line_last_pixel_enable:1;
    } sf7;
 
 };
@@ -459,33 +459,33 @@ struct brw_gs_unit_state
       GLuint pad0:8;
       GLuint rendering_enable:1; /* for Ironlake */
       GLuint pad4:1;
-      GLuint stats_enable:1; 
-      GLuint nr_urb_entries:7; 
+      GLuint stats_enable:1;
+      GLuint nr_urb_entries:7;
       GLuint pad1:1;
-      GLuint urb_entry_allocation_size:5; 
+      GLuint urb_entry_allocation_size:5;
       GLuint pad2:1;
-      GLuint max_threads:5; 
+      GLuint max_threads:5;
       GLuint pad3:2;
-   } thread4;   
-      
+   } thread4;
+
    struct
    {
-      GLuint sampler_count:3; 
+      GLuint sampler_count:3;
       GLuint pad0:2;
-      GLuint sampler_state_pointer:27; 
+      GLuint sampler_state_pointer:27;
    } gs5;
 
-   
+
    struct
    {
-      GLuint max_vp_index:4; 
+      GLuint max_vp_index:4;
       GLuint pad0:12;
       GLuint svbi_post_inc_value:10;
       GLuint pad1:1;
       GLuint svbi_post_inc_enable:1;
       GLuint svbi_payload:1;
       GLuint discard_adjaceny:1;
-      GLuint reorder_enable:1; 
+      GLuint reorder_enable:1;
       GLuint pad2:1;
    } gs6;
 };
@@ -497,30 +497,30 @@ struct brw_vs_unit_state
    struct thread1 thread1;
    struct thread2 thread2;
    struct thread3 thread3;
-   
+
    struct
    {
       GLuint pad0:10;
-      GLuint stats_enable:1; 
-      GLuint nr_urb_entries:7; 
+      GLuint stats_enable:1;
+      GLuint nr_urb_entries:7;
       GLuint pad1:1;
-      GLuint urb_entry_allocation_size:5; 
+      GLuint urb_entry_allocation_size:5;
       GLuint pad2:1;
-      GLuint max_threads:6; 
+      GLuint max_threads:6;
       GLuint pad3:1;
-   } thread4;   
+   } thread4;
 
    struct
    {
-      GLuint sampler_count:3; 
+      GLuint sampler_count:3;
       GLuint pad0:2;
-      GLuint sampler_state_pointer:27; 
+      GLuint sampler_state_pointer:27;
    } vs5;
 
    struct
    {
-      GLuint vs_enable:1; 
-      GLuint vert_cache_disable:1; 
+      GLuint vs_enable:1;
+      GLuint vert_cache_disable:1;
       GLuint pad0:30;
    } vs6;
 };
@@ -532,19 +532,19 @@ struct brw_wm_unit_state
    struct thread1 thread1;
    struct thread2 thread2;
    struct thread3 thread3;
-   
+
    struct {
-      GLuint stats_enable:1; 
+      GLuint stats_enable:1;
       GLuint depth_buffer_clear:1;
-      GLuint sampler_count:3; 
-      GLuint sampler_state_pointer:27; 
+      GLuint sampler_count:3;
+      GLuint sampler_state_pointer:27;
    } wm4;
-   
+
    struct
    {
-      GLuint enable_8_pix:1; 
-      GLuint enable_16_pix:1; 
-      GLuint enable_32_pix:1; 
+      GLuint enable_8_pix:1;
+      GLuint enable_16_pix:1;
+      GLuint enable_32_pix:1;
       GLuint enable_con_32_pix:1;
       GLuint enable_con_64_pix:1;
       GLuint pad0:1;
@@ -555,46 +555,46 @@ struct brw_wm_unit_state
       GLuint depth_buffer_resolve_enable:1;
       GLuint hierarchical_depth_buffer_resolve_enable:1;
 
-      GLuint legacy_global_depth_bias:1; 
-      GLuint line_stipple:1; 
-      GLuint depth_offset:1; 
-      GLuint polygon_stipple:1; 
-      GLuint line_aa_region_width:2; 
-      GLuint line_endcap_aa_region_width:2; 
-      GLuint early_depth_test:1; 
-      GLuint thread_dispatch_enable:1; 
-      GLuint program_uses_depth:1; 
-      GLuint program_computes_depth:1; 
-      GLuint program_uses_killpixel:1; 
-      GLuint legacy_line_rast: 1; 
-      GLuint transposed_urb_read_enable:1; 
-      GLuint max_threads:7; 
+      GLuint legacy_global_depth_bias:1;
+      GLuint line_stipple:1;
+      GLuint depth_offset:1;
+      GLuint polygon_stipple:1;
+      GLuint line_aa_region_width:2;
+      GLuint line_endcap_aa_region_width:2;
+      GLuint early_depth_test:1;
+      GLuint thread_dispatch_enable:1;
+      GLuint program_uses_depth:1;
+      GLuint program_computes_depth:1;
+      GLuint program_uses_killpixel:1;
+      GLuint legacy_line_rast: 1;
+      GLuint transposed_urb_read_enable:1;
+      GLuint max_threads:7;
    } wm5;
-   
-   GLfloat global_depth_offset_constant;  
-   GLfloat global_depth_offset_scale;   
-   
+
+   GLfloat global_depth_offset_constant;
+   GLfloat global_depth_offset_scale;
+
    /* for Ironlake only */
    struct {
       GLuint pad0:1;
-      GLuint grf_reg_count_1:3; 
+      GLuint grf_reg_count_1:3;
       GLuint pad1:2;
       GLuint kernel_start_pointer_1:26;
-   } wm8;       
+   } wm8;
 
    struct {
       GLuint pad0:1;
-      GLuint grf_reg_count_2:3; 
+      GLuint grf_reg_count_2:3;
       GLuint pad1:2;
       GLuint kernel_start_pointer_2:26;
-   } wm9;       
+   } wm9;
 
    struct {
       GLuint pad0:1;
-      GLuint grf_reg_count_3:3; 
+      GLuint grf_reg_count_3:3;
       GLuint pad1:2;
       GLuint kernel_start_pointer_3:26;
-   } wm10;       
+   } wm10;
 };
 
 struct brw_sampler_default_color {
@@ -612,51 +612,51 @@ struct gen5_sampler_default_color {
 
 struct brw_sampler_state
 {
-   
+
    struct
    {
-      GLuint shadow_function:3; 
-      GLuint lod_bias:11; 
-      GLuint min_filter:3; 
-      GLuint mag_filter:3; 
-      GLuint mip_filter:2; 
-      GLuint base_level:5; 
+      GLuint shadow_function:3;
+      GLuint lod_bias:11;
+      GLuint min_filter:3;
+      GLuint mag_filter:3;
+      GLuint mip_filter:2;
+      GLuint base_level:5;
       GLuint min_mag_neq:1;
-      GLuint lod_preclamp:1; 
-      GLuint default_color_mode:1; 
+      GLuint lod_preclamp:1;
+      GLuint default_color_mode:1;
       GLuint pad0:1;
-      GLuint disable:1; 
+      GLuint disable:1;
    } ss0;
 
    struct
    {
-      GLuint r_wrap_mode:3; 
-      GLuint t_wrap_mode:3; 
-      GLuint s_wrap_mode:3; 
+      GLuint r_wrap_mode:3;
+      GLuint t_wrap_mode:3;
+      GLuint s_wrap_mode:3;
       GLuint cube_control_mode:1;
       GLuint pad:2;
-      GLuint max_lod:10; 
-      GLuint min_lod:10; 
+      GLuint max_lod:10;
+      GLuint min_lod:10;
    } ss1;
 
-   
+
    struct
    {
       GLuint pad:5;
-      GLuint default_color_pointer:27; 
+      GLuint default_color_pointer:27;
    } ss2;
-   
+
    struct
    {
       GLuint non_normalized_coord:1;
       GLuint pad:12;
       GLuint address_round:6;
-      GLuint max_aniso:3; 
-      GLuint chroma_key_mode:1; 
-      GLuint chroma_key_index:2; 
-      GLuint chroma_key_enable:1; 
-      GLuint monochrome_filter_width:3; 
-      GLuint monochrome_filter_height:3; 
+      GLuint max_aniso:3;
+      GLuint chroma_key_mode:1;
+      GLuint chroma_key_index:2;
+      GLuint chroma_key_enable:1;
+      GLuint monochrome_filter_width:3;
+      GLuint monochrome_filter_height:3;
    } ss3;
 };
 
@@ -711,27 +711,27 @@ struct gen7_sampler_state
 
 struct brw_clipper_viewport
 {
-   GLfloat xmin;  
-   GLfloat xmax;  
-   GLfloat ymin;  
-   GLfloat ymax;  
+   GLfloat xmin;
+   GLfloat xmax;
+   GLfloat ymin;
+   GLfloat ymax;
 };
 
 struct brw_cc_viewport
 {
-   GLfloat min_depth;  
-   GLfloat max_depth;  
+   GLfloat min_depth;
+   GLfloat max_depth;
 };
 
 struct brw_sf_viewport
 {
    struct {
-      GLfloat m00;  
-      GLfloat m11;  
-      GLfloat m22;  
-      GLfloat m30;  
-      GLfloat m31;  
-      GLfloat m32;  
+      GLfloat m00;
+      GLfloat m11;
+      GLfloat m22;
+      GLfloat m30;
+      GLfloat m31;
+      GLfloat m32;
    } viewport;
 
    /* scissor coordinates are inclusive */
@@ -778,29 +778,29 @@ struct brw_vertex_element_state
 {
    struct
    {
-      GLuint src_offset:11; 
+      GLuint src_offset:11;
       GLuint pad:5;
-      GLuint src_format:9; 
+      GLuint src_format:9;
       GLuint pad0:1;
-      GLuint valid:1; 
-      GLuint vertex_buffer_index:5; 
+      GLuint valid:1;
+      GLuint vertex_buffer_index:5;
    } ve0;
-   
+
    struct
    {
-      GLuint dst_offset:8; 
+      GLuint dst_offset:8;
       GLuint pad:8;
-      GLuint vfcomponent3:4; 
-      GLuint vfcomponent2:4; 
-      GLuint vfcomponent1:4; 
-      GLuint vfcomponent0:4; 
+      GLuint vfcomponent3:4;
+      GLuint vfcomponent2:4;
+      GLuint vfcomponent1:4;
+      GLuint vfcomponent0:4;
    } ve1;
 };
 
 struct brw_urb_immediate {
    GLuint opcode:4;
    GLuint offset:6;
-   GLuint swizzle_control:2; 
+   GLuint swizzle_control:2;
    GLuint pad:1;
    GLuint allocate:1;
    GLuint used:1;
@@ -814,10 +814,10 @@ struct brw_urb_immediate {
 
 /* Instruction format for the execution units:
  */
- 
+
 struct brw_instruction
 {
-   struct 
+   struct
    {
       GLuint opcode:7;
       GLuint pad:1;
@@ -1010,7 +1010,7 @@ struct brw_instruction
        * Does not apply to Gen6+.  The SFID/message target moved to bits
        * 27:24 of the header (destreg__conditionalmod); EOT is in bits3.
        */
-       struct 
+       struct
        {
            GLuint pad:26;
            GLuint end_of_thread:1;
@@ -1222,8 +1222,8 @@ struct brw_instruction
       struct {
 	 GLuint binding_table_index:8;
 	 GLuint sampler:4;
-	 GLuint return_format:2; 
-	 GLuint msg_type:2;   
+	 GLuint return_format:2;
+	 GLuint msg_type:2;
 	 GLuint response_length:4;
 	 GLuint msg_length:4;
 	 GLuint msg_target:4;
@@ -1274,7 +1274,7 @@ struct brw_instruction
       struct {
 	 GLuint opcode:4;
 	 GLuint offset:6;
-	 GLuint swizzle_control:2; 
+	 GLuint swizzle_control:2;
 	 GLuint pad:1;
 	 GLuint allocate:1;
 	 GLuint used:1;
@@ -1321,9 +1321,9 @@ struct brw_instruction
       /** 965 PRM, Volume 4, Section 5.10.1.1: Message Descriptor */
       struct {
 	 GLuint binding_table_index:8;
-	 GLuint msg_control:4;  
-	 GLuint msg_type:2;  
-	 GLuint target_cache:2;    
+	 GLuint msg_control:4;
+	 GLuint msg_type:2;
+	 GLuint target_cache:2;
 	 GLuint response_length:4;
 	 GLuint msg_length:4;
 	 GLuint msg_target:4;
@@ -1347,9 +1347,9 @@ struct brw_instruction
       /** Ironlake PRM, Volume 4 Part 1, Section 5.10.2.1.2. */
       struct {
 	 GLuint binding_table_index:8;
-	 GLuint msg_control:4;  
-	 GLuint msg_type:2;  
-	 GLuint target_cache:2;    
+	 GLuint msg_control:4;
+	 GLuint msg_type:2;
+	 GLuint target_cache:2;
 	 GLuint pad0:3;
 	 GLuint header_present:1;
 	 GLuint response_length:5;
@@ -1363,7 +1363,7 @@ struct brw_instruction
 	 GLuint binding_table_index:8;
 	 GLuint msg_control:3;
 	 GLuint last_render_target:1;
-	 GLuint msg_type:3;    
+	 GLuint msg_type:3;
 	 GLuint send_commit_msg:1;
 	 GLuint response_length:4;
 	 GLuint msg_length:4;
@@ -1377,7 +1377,7 @@ struct brw_instruction
 	 GLuint binding_table_index:8;
 	 GLuint msg_control:3;
 	 GLuint last_render_target:1;
-	 GLuint msg_type:3;    
+	 GLuint msg_type:3;
 	 GLuint send_commit_msg:1;
 	 GLuint pad0:3;
 	 GLuint header_present:1;
