From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 30 Apr 2018 17:25:42 +0000 (-0700)
Subject: i965: Move unmap_movntdqa before map_movntdqa
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b3ad6f5ca69749f71987be086a97e6442bbe05fb;p=mesa.git

i965: Move unmap_movntdqa before map_movntdqa

Reorder code to avoid a forward declaration in the next patch.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 22947c202c2..0548ec2d8f5 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -3193,6 +3193,18 @@ fail:
  * "Map" a buffer by copying it to an untiled temporary using MOVNTDQA.
  */
 #if defined(USE_SSE41)
+static void
+intel_miptree_unmap_movntdqa(struct brw_context *brw,
+                             struct intel_mipmap_tree *mt,
+                             struct intel_miptree_map *map,
+                             unsigned int level,
+                             unsigned int slice)
+{
+   _mesa_align_free(map->buffer);
+   map->buffer = NULL;
+   map->ptr = NULL;
+}
+
 static void
 intel_miptree_map_movntdqa(struct brw_context *brw,
                            struct intel_mipmap_tree *mt,
@@ -3251,18 +3263,6 @@ intel_miptree_map_movntdqa(struct brw_context *brw,
 
    intel_miptree_unmap_raw(mt);
 }
-
-static void
-intel_miptree_unmap_movntdqa(struct brw_context *brw,
-                             struct intel_mipmap_tree *mt,
-                             struct intel_miptree_map *map,
-                             unsigned int level,
-                             unsigned int slice)
-{
-   _mesa_align_free(map->buffer);
-   map->buffer = NULL;
-   map->ptr = NULL;
-}
 #endif
 
 static void