i915g: Cleanup i915_state_emit.c

diff --git a/src/gallium/drivers/i915simple/i915_state_emit.c b/src/gallium/drivers/i915simple/i915_state_emit.c
index 1e1fb968b47336e40e8bdd5ecb0ad0ea6f52a47a..ab361e3d4ba78e1d10e0c5a90eee19d3f85feeac 100644 (file)
--- a/src/gallium/drivers/i915simple/i915_state_emit.c
+++ b/src/gallium/drivers/i915simple/i915_state_emit.c
@@ -107,7 +107,7 @@ i915_emit_hardware_state(struct i915_context *i915 )
                              6 
                            ) * 3/2; /* plus 50% margin */
    const unsigned relocs = ( I915_TEX_UNITS +
-                            3
+                             3
                            ) * 3/2; /* plus 50% margin */
 
 #if 0
@@ -123,9 +123,9 @@ i915_emit_hardware_state(struct i915_context *i915 )
    if (i915->hardware_dirty & I915_HW_INVARIENT)
    {
       OUT_BATCH(_3DSTATE_AA_CMD |
-               AA_LINE_ECAAR_WIDTH_ENABLE |
-               AA_LINE_ECAAR_WIDTH_1_0 |
-               AA_LINE_REGION_WIDTH_ENABLE | AA_LINE_REGION_WIDTH_1_0);
+                AA_LINE_ECAAR_WIDTH_ENABLE |
+                AA_LINE_ECAAR_WIDTH_1_0 |
+                AA_LINE_REGION_WIDTH_ENABLE | AA_LINE_REGION_WIDTH_1_0);
 
       OUT_BATCH(_3DSTATE_DFLT_DIFFUSE_CMD);
       OUT_BATCH(0);
@@ -137,24 +137,24 @@ i915_emit_hardware_state(struct i915_context *i915 )
       OUT_BATCH(0);
 
       OUT_BATCH(_3DSTATE_COORD_SET_BINDINGS |
-               CSB_TCB(0, 0) |
-               CSB_TCB(1, 1) |
-               CSB_TCB(2, 2) |
-               CSB_TCB(3, 3) |
-               CSB_TCB(4, 4) | 
-               CSB_TCB(5, 5) | 
-               CSB_TCB(6, 6) | 
-               CSB_TCB(7, 7));
+                CSB_TCB(0, 0) |
+                CSB_TCB(1, 1) |
+                CSB_TCB(2, 2) |
+                CSB_TCB(3, 3) |
+                CSB_TCB(4, 4) | 
+                CSB_TCB(5, 5) | 
+                CSB_TCB(6, 6) | 
+                CSB_TCB(7, 7));
 
       OUT_BATCH(_3DSTATE_RASTER_RULES_CMD |
-               ENABLE_POINT_RASTER_RULE |
-               OGL_POINT_RASTER_RULE |
-               ENABLE_LINE_STRIP_PROVOKE_VRTX |
-               ENABLE_TRI_FAN_PROVOKE_VRTX |
-               LINE_STRIP_PROVOKE_VRTX(1) |
-               TRI_FAN_PROVOKE_VRTX(2) | 
-               ENABLE_TEXKILL_3D_4D | 
-               TEXKILL_4D);
+                ENABLE_POINT_RASTER_RULE |
+                OGL_POINT_RASTER_RULE |
+                ENABLE_LINE_STRIP_PROVOKE_VRTX |
+                ENABLE_TRI_FAN_PROVOKE_VRTX |
+                LINE_STRIP_PROVOKE_VRTX(1) |
+                TRI_FAN_PROVOKE_VRTX(2) | 
+                ENABLE_TEXKILL_3D_4D | 
+                TEXKILL_4D);
 
       /* Need to initialize this to zero.
        */
@@ -173,21 +173,21 @@ i915_emit_hardware_state(struct i915_context *i915 )
    if (i915->hardware_dirty & I915_HW_IMMEDIATE)
    {
       OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | 
-               I1_LOAD_S(0) |
-               I1_LOAD_S(1) |
-               I1_LOAD_S(2) |
-               I1_LOAD_S(4) |
-               I1_LOAD_S(5) |
-               I1_LOAD_S(6) | 
-               (5));
+                I1_LOAD_S(0) |
+                I1_LOAD_S(1) |
+                I1_LOAD_S(2) |
+                I1_LOAD_S(4) |
+                I1_LOAD_S(5) |
+                I1_LOAD_S(6) | 
+                (5));
       
       if(i915->vbo)
          OUT_RELOC(i915->vbo,
                    I915_BUFFER_ACCESS_READ,
                    i915->current.immediate[I915_IMMEDIATE_S0]);
       else
-        /* FIXME: we should not do this */
-        OUT_BATCH(0);
+         /* FIXME: we should not do this */
+         OUT_BATCH(0);
       OUT_BATCH(i915->current.immediate[I915_IMMEDIATE_S1]);
       OUT_BATCH(i915->current.immediate[I915_IMMEDIATE_S2]);
       OUT_BATCH(i915->current.immediate[I915_IMMEDIATE_S4]);
@@ -200,7 +200,7 @@ i915_emit_hardware_state(struct i915_context *i915 )
    {
       int i;
       for (i = 0; i < I915_MAX_DYNAMIC; i++) {
-        OUT_BATCH(i915->current.dynamic[i]);
+         OUT_BATCH(i915->current.dynamic[i]);
       }
    }
    
@@ -211,68 +211,68 @@ i915_emit_hardware_state(struct i915_context *i915 )
       struct pipe_surface *depth_surface = i915->framebuffer.zsbuf;
 
       if (cbuf_surface) {
-        unsigned ctile = BUF_3D_USE_FENCE;
+         unsigned ctile = BUF_3D_USE_FENCE;
          struct i915_texture *tex = (struct i915_texture *)
                                     cbuf_surface->texture;
          assert(tex);
 
-        if (tex && tex->tiled) {
-           ctile = BUF_3D_TILED_SURFACE;
-        }
+         if (tex && tex->tiled) {
+            ctile = BUF_3D_TILED_SURFACE;
+         }
 
-        OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
+         OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
 
-        OUT_BATCH(BUF_3D_ID_COLOR_BACK |
-                  BUF_3D_PITCH(tex->stride) |  /* pitch in bytes */
-                  ctile);
+         OUT_BATCH(BUF_3D_ID_COLOR_BACK |
+                   BUF_3D_PITCH(tex->stride) |  /* pitch in bytes */
+                   ctile);
 
-        OUT_RELOC(tex->buffer,
-                  I915_BUFFER_ACCESS_WRITE,
-                  cbuf_surface->offset);
+         OUT_RELOC(tex->buffer,
+                   I915_BUFFER_ACCESS_WRITE,
+                   cbuf_surface->offset);
       }
 
       /* What happens if no zbuf??
        */
       if (depth_surface) {
-        unsigned ztile = BUF_3D_USE_FENCE;
+         unsigned ztile = BUF_3D_USE_FENCE;
          struct i915_texture *tex = (struct i915_texture *)
                                     depth_surface->texture;
          assert(tex);
 
-        if (tex && tex->tiled) {
-           ztile = BUF_3D_TILED_SURFACE;
-        }
+         if (tex && tex->tiled) {
+            ztile = BUF_3D_TILED_SURFACE;
+         }
 
-        OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
+         OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
 
-        OUT_BATCH(BUF_3D_ID_DEPTH |
-                  BUF_3D_PITCH(tex->stride) |  /* pitch in bytes */
-                  ztile);
+         OUT_BATCH(BUF_3D_ID_DEPTH |
+                   BUF_3D_PITCH(tex->stride) |  /* pitch in bytes */
+                   ztile);
 
-        OUT_RELOC(tex->buffer,
-                  I915_BUFFER_ACCESS_WRITE,
-                  depth_surface->offset);
+         OUT_RELOC(tex->buffer,
+                   I915_BUFFER_ACCESS_WRITE,
+                   depth_surface->offset);
       }
    
       {
-        unsigned cformat, zformat = 0;
+         unsigned cformat, zformat = 0;
       
-        if (cbuf_surface)
+         if (cbuf_surface)
             cformat = cbuf_surface->format;
          else
             cformat = PIPE_FORMAT_A8R8G8B8_UNORM; /* arbitrary */
          cformat = translate_format(cformat);
 
-        if (depth_surface) 
-           zformat = translate_depth_format( i915->framebuffer.zsbuf->format );
+         if (depth_surface) 
+            zformat = translate_depth_format( i915->framebuffer.zsbuf->format );
 
-        OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
-        OUT_BATCH(DSTORG_HORT_BIAS(0x8) | /* .5 */
-                  DSTORG_VERT_BIAS(0x8) | /* .5 */
-                  LOD_PRECLAMP_OGL |
-                  TEX_DEFAULT_COLOR_OGL |
-                  cformat |
-                  zformat );
+         OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
+         OUT_BATCH(DSTORG_HORT_BIAS(0x8) | /* .5 */
+                   DSTORG_VERT_BIAS(0x8) | /* .5 */
+                   LOD_PRECLAMP_OGL |
+                   TEX_DEFAULT_COLOR_OGL |
+                   cformat |
+                   zformat );
       }
    }
 
@@ -315,20 +315,20 @@ i915_emit_hardware_state(struct i915_context *i915 )
    if (i915->hardware_dirty & I915_HW_SAMPLER) 
    {
       if (i915->current.sampler_enable_nr) {
-        int i;
-        
-        OUT_BATCH( _3DSTATE_SAMPLER_STATE | 
-                   (3 * i915->current.sampler_enable_nr) );
-
-        OUT_BATCH( i915->current.sampler_enable_flags );
-
-        for (i = 0; i < I915_TEX_UNITS; i++) {
-           if (i915->current.sampler_enable_flags & (1<<i)) {
-              OUT_BATCH( i915->current.sampler[i][0] );
-              OUT_BATCH( i915->current.sampler[i][1] );
-              OUT_BATCH( i915->current.sampler[i][2] );
-           }
-        }
+         int i;
+         
+         OUT_BATCH( _3DSTATE_SAMPLER_STATE | 
+                    (3 * i915->current.sampler_enable_nr) );
+
+         OUT_BATCH( i915->current.sampler_enable_flags );
+
+         for (i = 0; i < I915_TEX_UNITS; i++) {
+            if (i915->current.sampler_enable_flags & (1<<i)) {
+               OUT_BATCH( i915->current.sampler[i][0] );
+               OUT_BATCH( i915->current.sampler[i][1] );
+               OUT_BATCH( i915->current.sampler[i][2] );
+            }
+         }
       }
    }
 #endif