i915g: Whitespace & formating

[mesa.git] / src / gallium / drivers / i915 / i915_resource_texture.c

diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
index b2599688353ca78e29318c0727423a7f7a0e63ba..144671228d6e266b5e7f9c620c75c847568c5bd2 100644 (file)
--- a/src/gallium/drivers/i915/i915_resource_texture.c
+++ b/src/gallium/drivers/i915/i915_resource_texture.c
@@ -92,9 +92,9 @@ power_of_two(unsigned x)
 
 static void
 i915_texture_set_level_info(struct i915_texture *tex,
-                             unsigned level,
-                             unsigned nr_images,
-                             unsigned w, unsigned h, unsigned d)
+                            unsigned level,
+                            unsigned nr_images,
+                            unsigned w, unsigned h, unsigned d)
 {
    assert(level < Elements(tex->nr_images));
 
@@ -138,7 +138,7 @@ i915_texture_set_image_offset(struct i915_texture *tex,
 
 
 /*
- * i915 layout functions, some used by i945
+ * Shared layout functions
  */
 
 
@@ -146,7 +146,7 @@ i915_texture_set_image_offset(struct i915_texture *tex,
  * Special case to deal with scanout textures.
  */
 static boolean
-i915_scanout_layout(struct i915_texture *tex)
+i9x5_scanout_layout(struct i915_texture *tex)
 {
    struct pipe_resource *pt = &tex->b.b;
 
@@ -181,7 +181,7 @@ i915_scanout_layout(struct i915_texture *tex)
  * Special case to deal with shared textures.
  */
 static boolean
-i915_display_target_layout(struct i915_texture *tex)
+i9x5_display_target_layout(struct i915_texture *tex)
 {
    struct pipe_resource *pt = &tex->b.b;
 
@@ -209,6 +209,12 @@ i915_display_target_layout(struct i915_texture *tex)
    return TRUE;
 }
 
+
+/*
+ * i915 layout functions
+ */
+
+
 static void
 i915_texture_layout_2d(struct i915_texture *tex)
 {
@@ -220,7 +226,7 @@ i915_texture_layout_2d(struct i915_texture *tex)
 
    /* used for scanouts that need special layouts */
    if (pt->bind & PIPE_BIND_SCANOUT)
-      if (i915_scanout_layout(tex))
+      if (i9x5_scanout_layout(tex))
          return;
 
    /* shared buffers needs to be compatible with X servers 
@@ -229,8 +235,8 @@ i915_texture_layout_2d(struct i915_texture *tex)
     * of core gallium, and probably move the flag to resource.flags,
     * rather than bindings.
     */
-   if (pt->bind & PIPE_BIND_SHARED)
-      if (i915_display_target_layout(tex))
+   if (pt->bind & (PIPE_BIND_SHARED | PIPE_BIND_DISPLAY_TARGET))
+      if (i9x5_display_target_layout(tex))
          return;
 
    tex->stride = align(util_format_get_stride(pt->format, pt->width0), 4);
@@ -375,12 +381,12 @@ i945_texture_layout_2d(struct i915_texture *tex)
 
    /* used for scanouts that need special layouts */
    if (tex->b.b.bind & PIPE_BIND_SCANOUT)
-      if (i915_scanout_layout(tex))
+      if (i9x5_scanout_layout(tex))
          return;
 
    /* shared buffers needs to be compatible with X servers */
-   if (tex->b.b.bind & PIPE_BIND_SHARED)
-      if (i915_display_target_layout(tex))
+   if (tex->b.b.bind & (PIPE_BIND_SHARED | PIPE_BIND_DISPLAY_TARGET))
+      if (i9x5_display_target_layout(tex))
          return;
 
    tex->stride = align(util_format_get_stride(pt->format, pt->width0), 4);
@@ -419,8 +425,7 @@ i945_texture_layout_2d(struct i915_texture *tex)
        */
       if (level == 1) {
          x += align(nblocksx, align_x);
-      }
-      else {
+      } else {
          y += nblocksy;
       }
 
@@ -690,19 +695,16 @@ i915_texture_transfer_map(struct pipe_context *pipe,
 
    if (resource->target == PIPE_TEXTURE_CUBE) {
       offset = tex->image_offset[sr.level][sr.face];
-   }
-   else if (resource->target == PIPE_TEXTURE_3D) {
+   } else if (resource->target == PIPE_TEXTURE_3D) {
       offset = tex->image_offset[sr.level][box->z];
-   }
-   else {
+   } else {
       offset = tex->image_offset[sr.level][0];
       assert(sr.face == 0);
       assert(box->z == 0);
    }
 
-   map = iws->buffer_map(iws,
-                        tex->buffer,
-                        (transfer->usage & PIPE_TRANSFER_WRITE) ? TRUE : FALSE);
+   map = iws->buffer_map(iws, tex->buffer,
+                         (transfer->usage & PIPE_TRANSFER_WRITE) ? TRUE : FALSE);
    if (map == NULL)
       return NULL;