Mesa (master): i965: Fix wonky indentation left by brw_bo_alloc_tiled rename.

Kenneth Graunke kwg at kemper.freedesktop.org
Tue Apr 11 06:25:18 UTC 2017


Module: Mesa
Branch: master
Commit: 50b987c0f022d7297b3c97a3f8ec0b51c83e4454
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=50b987c0f022d7297b3c97a3f8ec0b51c83e4454

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Apr 10 23:23:13 2017 -0700

i965: Fix wonky indentation left by brw_bo_alloc_tiled rename.

---

 src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 16 ++++++++--------
 src/mesa/drivers/dri/i965/intel_screen.c      | 19 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 1e8b13853d..81e2d6e1e9 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1552,8 +1552,8 @@ intel_miptree_alloc_non_msrt_mcs(struct brw_context *brw,
     * trying to recalculate based on different format block sizes.
     */
    buf->bo = brw_bo_alloc_tiled(brw->bufmgr, "ccs-miptree",
-                                      buf->pitch, buf->size / buf->pitch,
-                                      1, &tiling, &pitch, alloc_flags);
+                                buf->pitch, buf->size / buf->pitch,
+                                1, &tiling, &pitch, alloc_flags);
    if (buf->bo) {
       assert(pitch == buf->pitch);
       assert(tiling == I915_TILING_Y);
@@ -1689,9 +1689,9 @@ intel_gen7_hiz_buf_create(struct brw_context *brw,
    unsigned long pitch;
    uint32_t tiling = I915_TILING_Y;
    buf->aux_base.bo = brw_bo_alloc_tiled(brw->bufmgr, "hiz",
-                                               hz_width, hz_height, 1,
-                                               &tiling, &pitch,
-                                               BO_ALLOC_FOR_RENDER);
+                                         hz_width, hz_height, 1,
+                                         &tiling, &pitch,
+                                         BO_ALLOC_FOR_RENDER);
    if (!buf->aux_base.bo) {
       free(buf);
       return NULL;
@@ -1786,9 +1786,9 @@ intel_gen8_hiz_buf_create(struct brw_context *brw,
    unsigned long pitch;
    uint32_t tiling = I915_TILING_Y;
    buf->aux_base.bo = brw_bo_alloc_tiled(brw->bufmgr, "hiz",
-                                               hz_width, hz_height, 1,
-                                               &tiling, &pitch,
-                                               BO_ALLOC_FOR_RENDER);
+                                         hz_width, hz_height, 1,
+                                         &tiling, &pitch,
+                                         BO_ALLOC_FOR_RENDER);
    if (!buf->aux_base.bo) {
       free(buf);
       return NULL;
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index ce911a952e..96e7a39863 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -614,8 +614,8 @@ intel_create_image_common(__DRIscreen *dri_screen,
 
    cpp = _mesa_get_format_bytes(image->format);
    image->bo = brw_bo_alloc_tiled(screen->bufmgr, "image",
-                                        width, height, cpp, &tiling,
-                                        &pitch, 0);
+                                  width, height, cpp, &tiling,
+                                  &pitch, 0);
    if (image->bo == NULL) {
       free(image);
       return NULL;
@@ -1298,8 +1298,7 @@ intel_detect_swizzling(struct intel_screen *screen)
    uint32_t swizzle_mode = 0;
 
    buffer = brw_bo_alloc_tiled(screen->bufmgr, "swizzle test",
-				     64, 64, 4,
-				     &tiling, &aligned_pitch, flags);
+                               64, 64, 4, &tiling, &aligned_pitch, flags);
    if (buffer == NULL)
       return false;
 
@@ -2102,12 +2101,12 @@ intelAllocateBuffer(__DRIscreen *dri_screen,
    unsigned long pitch;
    int cpp = format / 8;
    intelBuffer->bo = brw_bo_alloc_tiled(screen->bufmgr,
-                                              "intelAllocateBuffer",
-                                              width,
-                                              height,
-                                              cpp,
-                                              &tiling, &pitch,
-                                              BO_ALLOC_FOR_RENDER);
+                                        "intelAllocateBuffer",
+                                        width,
+                                        height,
+                                        cpp,
+                                        &tiling, &pitch,
+                                        BO_ALLOC_FOR_RENDER);
 
    if (intelBuffer->bo == NULL) {
 	   free(intelBuffer);




More information about the mesa-commit mailing list