i965g: Winsys whitespace
authorJakob Bornecrantz <jakob@vmware.com>
Fri, 6 Nov 2009 00:15:01 +0000 (00:15 +0000)
committerJakob Bornecrantz <wallbraker@gmail.com>
Fri, 6 Nov 2009 15:55:06 +0000 (15:55 +0000)
src/gallium/winsys/drm/i965/gem/i965_drm_api.c
src/gallium/winsys/drm/i965/gem/i965_drm_buffer.c

index 8b9c777a6fe428b0f09d2f8208e035ecba9b7d8e..2399835d7984c0ada030c280f34e81694d87b6bf 100644 (file)
@@ -5,8 +5,8 @@
 #include "i965_drm_winsys.h"
 #include "util/u_memory.h"
 
-#include "i965/brw_context.h"  /* XXX: shouldn't be doing this */
-#include "i965/brw_screen.h"   /* XXX: shouldn't be doing this */
+#include "i965/brw_context.h"        /* XXX: shouldn't be doing this */
+#include "i965/brw_screen.h"         /* XXX: shouldn't be doing this */
 
 #include "trace/tr_drm.h"
 
@@ -39,7 +39,7 @@ i965_libdrm_get_device_id(unsigned int *device_id)
 
 static struct i965_libdrm_buffer *
 i965_libdrm_buffer_from_handle(struct i965_libdrm_winsys *idws,
-                             const char* name, unsigned handle)
+                               const char* name, unsigned handle)
 {
    struct i965_libdrm_buffer *buf = CALLOC_STRUCT(i965_libdrm_buffer);
    uint32_t tile = 0, swizzle = 0;
@@ -73,11 +73,11 @@ err:
 
 static struct pipe_texture *
 i965_libdrm_texture_from_shared_handle(struct drm_api *api,
-                                     struct pipe_screen *screen,
-                                     struct pipe_texture *template,
-                                     const char* name,
-                                     unsigned pitch,
-                                     unsigned handle)
+                                       struct pipe_screen *screen,
+                                       struct pipe_texture *template,
+                                       const char* name,
+                                       unsigned pitch,
+                                       unsigned handle)
 {
    /* XXX: this is silly -- there should be a way to get directly from
     * the "drm_api" struct to ourselves, without peering into
@@ -96,10 +96,10 @@ i965_libdrm_texture_from_shared_handle(struct drm_api *api,
 
 static boolean
 i965_libdrm_shared_handle_from_texture(struct drm_api *api,
-                                     struct pipe_screen *screen,
-                                     struct pipe_texture *texture,
-                                     unsigned *pitch,
-                                     unsigned *handle)
+                                       struct pipe_screen *screen,
+                                       struct pipe_texture *texture,
+                                       unsigned *pitch,
+                                       unsigned *handle)
 {
    struct i965_libdrm_buffer *buf = NULL;
    struct brw_winsys_buffer *buffer = NULL;
@@ -120,10 +120,10 @@ i965_libdrm_shared_handle_from_texture(struct drm_api *api,
 
 static boolean
 i965_libdrm_local_handle_from_texture(struct drm_api *api,
-                                    struct pipe_screen *screen,
-                                    struct pipe_texture *texture,
-                                    unsigned *pitch,
-                                    unsigned *handle)
+                                      struct pipe_screen *screen,
+                                      struct pipe_texture *texture,
+                                      unsigned *pitch,
+                                      unsigned *handle)
 {
    struct brw_winsys_buffer *buffer = NULL;
    if (!brw_texture_get_winsys_buffer(texture, &buffer, pitch))
@@ -146,7 +146,7 @@ i965_libdrm_winsys_destroy(struct brw_winsys_screen *iws)
 
 static struct pipe_screen *
 i965_libdrm_create_screen(struct drm_api *api, int drmFD,
-                     struct drm_create_screen_arg *arg)
+                          struct drm_create_screen_arg *arg)
 {
    struct i965_libdrm_winsys *idws;
    unsigned int deviceID;
index 431bedbaffef76f39251c9a067c876582e09ffd7..339354059fdefdf991abb84f1db0a8bafd9bcf5f 100644 (file)
@@ -45,9 +45,9 @@ i965_libdrm_bo_alloc(struct brw_winsys_screen *sws,
    }
 
    buf->bo = drm_intel_bo_alloc(idws->gem, 
-                               names[type], 
-                               size, 
-                               alignment);
+                                names[type], 
+                                size, 
+                                alignment);
 
    if (!buf->bo)
       goto err;
@@ -73,11 +73,11 @@ i965_libdrm_bo_destroy(struct brw_winsys_buffer *buffer)
 }
 
 static enum pipe_error
-i965_libdrm_bo_emit_reloc( struct brw_winsys_buffer *buffer,
-                          enum brw_buffer_usage usage,
-                          unsigned delta,
-                          unsigned offset,
-                          struct brw_winsys_buffer *buffer2)
+i965_libdrm_bo_emit_reloc(struct brw_winsys_buffer *buffer,
+                          enum brw_buffer_usage usage,
+                          unsigned delta,
+                          unsigned offset,
+                          struct brw_winsys_buffer *buffer2)
 {
    struct i965_libdrm_buffer *buf = i965_libdrm_buffer(buffer);
    struct i965_libdrm_buffer *buf2 = i965_libdrm_buffer(buffer2);
@@ -126,8 +126,8 @@ i965_libdrm_bo_emit_reloc( struct brw_winsys_buffer *buffer,
 }
 
 static enum pipe_error 
-i965_libdrm_bo_exec( struct brw_winsys_buffer *buffer,
-                    unsigned bytes_used )
+i965_libdrm_bo_exec(struct brw_winsys_buffer *buffer,
+                    unsigned bytes_used)
 {
    struct i965_libdrm_buffer *buf = i965_libdrm_buffer(buffer);
    int ret;
@@ -177,7 +177,7 @@ i965_libdrm_bo_is_busy(struct brw_winsys_buffer *buffer)
 
 static boolean 
 i965_libdrm_bo_references(struct brw_winsys_buffer *a,
-                         struct brw_winsys_buffer *b)
+                          struct brw_winsys_buffer *b)
 {
    struct i965_libdrm_buffer *bufa = i965_libdrm_buffer(a);
    struct i965_libdrm_buffer *bufb = i965_libdrm_buffer(b);
@@ -191,9 +191,9 @@ i965_libdrm_bo_references(struct brw_winsys_buffer *a,
  * bo_emit_reloc?
  */
 static enum pipe_error
-i965_libdrm_check_aperture_space( struct brw_winsys_screen *iws,
-                                 struct brw_winsys_buffer **buffers,
-                                 unsigned count )
+i965_libdrm_check_aperture_space(struct brw_winsys_screen *iws,
+                                 struct brw_winsys_buffer **buffers,
+                                 unsigned count)
 {
    static drm_intel_bo *bos[128];
    int i;
@@ -223,14 +223,14 @@ i965_libdrm_bo_map(struct brw_winsys_buffer *buffer,
 
    if (!buf->map_count) {
       if (buf->map_gtt) {
-        ret = drm_intel_gem_bo_map_gtt(buf->bo);
-        if (ret)
-           return NULL;
+         ret = drm_intel_gem_bo_map_gtt(buf->bo);
+         if (ret)
+            return NULL;
       }
       else {
-        ret = drm_intel_bo_map(buf->bo, write);
-        if (ret)
-           return NULL;
+         ret = drm_intel_bo_map(buf->bo, write);
+         if (ret)
+            return NULL;
       }
    }