Lift intel_mipmap_tree.c to st_mipmap_tree.c

8 files changed, 7 insertions, 8 deletions

diff --git a/src/mesa/drivers/dri/i915pipe/Makefile b/src/mesa/drivers/dri/i915pipe/Makefile
index 4e8d020196..f9403abd73 100644
--- a/src/mesa/drivers/dri/i915pipe/Makefile
+++ b/src/mesa/drivers/dri/i915pipe/Makefile
@@ -13,7 +13,6 @@ DRIVER_SOURCES = \
 	intel_softpipe.c \
 	intel_buffer_objects.c \
 	intel_batchbuffer.c \
-	intel_mipmap_tree.c \
 	intel_tex_layout.c \
 	intel_tex_image.c \
 	intel_tex_subimage.c \
diff --git a/src/mesa/drivers/dri/i915pipe/intel_fbo.c b/src/mesa/drivers/dri/i915pipe/intel_fbo.c
index fe5b1a37df..061c6bfa1f 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_fbo.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_fbo.c
@@ -39,7 +39,7 @@
 #include "intel_buffers.h"
 #include "intel_depthstencil.h"
 #include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
+#include "state_tracker/st_mipmap_tree.h"
 #include "intel_tex.h"
 
 #include "pipe/p_context.h"
diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex.c b/src/mesa/drivers/dri/i915pipe/intel_tex.c
index 5e9ab1c9ca..c2f5727e6b 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_tex.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_tex.c
@@ -1,6 +1,6 @@
 #include "texobj.h"
 #include "intel_context.h"
-#include "intel_mipmap_tree.h"
+#include "state_tracker/st_mipmap_tree.h"
 #include "intel_tex.h"
 
 #define FILE_DEBUG_FLAG DEBUG_TEXTURE
diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c b/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c
index bf06b5fed5..88cdee4583 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c
@@ -35,7 +35,7 @@
 #include "intel_context.h"
 #include "intel_batchbuffer.h"
 #include "intel_buffers.h"
-#include "intel_mipmap_tree.h"
+#include "state_tracker/st_mipmap_tree.h"
 #include "intel_fbo.h"
 #include "intel_tex.h"
 #include "intel_blit.h"
diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_image.c b/src/mesa/drivers/dri/i915pipe/intel_tex_image.c
index 19aa61ae83..ea7b26b7f1 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_tex_image.c
@@ -18,7 +18,7 @@
 #include "intel_context.h"
 #include "intel_buffer_objects.h"
 #include "intel_batchbuffer.h"
-#include "intel_mipmap_tree.h"
+#include "state_tracker/st_mipmap_tree.h"
 #include "intel_tex.h"
 #include "intel_ioctl.h"
 #include "intel_blit.h"
diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c b/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c
index 50ffd0ed1d..27b56e907d 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c
@@ -33,7 +33,7 @@
 
 #include "intel_context.h"
 #include "intel_tex.h"
-#include "intel_mipmap_tree.h"
+#include "state_tracker/st_mipmap_tree.h"
 
 #include "pipe/p_context.h"
 
diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_validate.c b/src/mesa/drivers/dri/i915pipe/intel_tex_validate.c
index 4b06e1803c..2083a2434d 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_tex_validate.c
@@ -1,7 +1,7 @@
 #include "mtypes.h"
 #include "macros.h"
 
-#include "intel_mipmap_tree.h"
+#include "state_tracker/st_mipmap_tree.h"
 #include "intel_tex.h"
 
 #include "pipe/p_state.h"
diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.c b/src/mesa/drivers/dri/intel/intel_tex_layout.c
index 61b8fb77c5..433a2c5f47 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_layout.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_layout.c
@@ -33,7 +33,7 @@
 #include "macros.h"
 #include "pipe/p_state.h"
 #include "intel_tex_layout.h"
-#include "intel_mipmap_tree.h"
+#include "state_tracker/st_mipmap_tree.h"
 
 
 static GLuint minify( GLuint d )