1 files changed, 0 insertions, 141 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
deleted file mode 100644
index a8a8647..0000000
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ /dev/null
@@ -1,141 +0,0 @@
-#include "main/mtypes.h"
-#include "main/macros.h"
-#include "main/samplerobj.h"
-#include "main/texobj.h"
-
-#include "intel_context.h"
-#include "intel_mipmap_tree.h"
-#include "intel_blit.h"
-#include "intel_tex.h"
-#include "intel_tex_layout.h"
-
-#define FILE_DEBUG_FLAG DEBUG_TEXTURE
-
-/**
- * When validating, we only care about the texture images that could
- * be seen, so for non-mipmapped modes we want to ignore everything
- * but BaseLevel.
- */
-static void
-intel_update_max_level(struct intel_texture_object *intelObj,
-		       struct gl_sampler_object *sampler)
-{
-   struct gl_texture_object *tObj = &intelObj->base;
-   int maxlevel;
-
-   if (sampler->MinFilter == GL_NEAREST ||
-       sampler->MinFilter == GL_LINEAR) {
-      maxlevel = tObj->BaseLevel;
-   } else {
-      maxlevel = tObj->_MaxLevel;
-   }
-
-   if (intelObj->_MaxLevel != maxlevel) {
-      intelObj->_MaxLevel = maxlevel;
-      intelObj->needs_validate = true;
-   }
-}
-
-/*  
- */
-GLuint
-intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
-{
-   struct gl_context *ctx = &intel->ctx;
-   struct gl_texture_object *tObj = intel->ctx.Texture.Unit[unit]._Current;
-   struct intel_texture_object *intelObj = intel_texture_object(tObj);
-   struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
-   GLuint face, i;
-   GLuint nr_faces = 0;
-   struct intel_texture_image *firstImage;
-   int width, height, depth;
-
-   /* TBOs require no validation -- they always just point to their BO. */
-   if (tObj->Target == GL_TEXTURE_BUFFER)
-      return true;
-
-   /* We know/require this is true by now: 
-    */
-   assert(intelObj->base._BaseComplete);
-
-   /* What levels must the tree include at a minimum?
-    */
-   intel_update_max_level(intelObj, sampler);
-   if (intelObj->mt && intelObj->mt->first_level != tObj->BaseLevel)
-      intelObj->needs_validate = true;
-
-   if (!intelObj->needs_validate)
-      return true;
-
-   firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]);
-
-   /* Check tree can hold all active levels.  Check tree matches
-    * target, imageFormat, etc.
-    *
-    * For pre-gen4, we have to match first_level == tObj->BaseLevel,
-    * because we don't have the control that gen4 does to make min/mag
-    * determination happen at a nonzero (hardware) baselevel.  Because
-    * of that, we just always relayout on baselevel change.
-    */
-   if (intelObj->mt &&
-       (!intel_miptree_match_image(intelObj->mt, &firstImage->base.Base) ||
-	intelObj->mt->first_level != tObj->BaseLevel ||
-	intelObj->mt->last_level < intelObj->_MaxLevel)) {
-      intel_miptree_release(&intelObj->mt);
-   }
-
-
-   /* May need to create a new tree:
-    */
-   if (!intelObj->mt) {
-      intel_miptree_get_dimensions_for_image(&firstImage->base.Base,
-					     &width, &height, &depth);
-
-      perf_debug("Creating new %s %dx%dx%d %d..%d miptree to handle finalized "
-                 "texture miptree.\n",
-                 _mesa_get_format_name(firstImage->base.Base.TexFormat),
-                 width, height, depth, tObj->BaseLevel, intelObj->_MaxLevel);
-
-      intelObj->mt = intel_miptree_create(intel,
-                                          intelObj->base.Target,
-					  firstImage->base.Base.TexFormat,
-                                          tObj->BaseLevel,
-                                          intelObj->_MaxLevel,
-                                          width,
-                                          height,
-                                          depth,
-					  true,
-                                          0 /* num_samples */,
-                                          INTEL_MIPTREE_TILING_ANY);
-      if (!intelObj->mt)
-         return false;
-   }
-
-   /* Pull in any images not in the object's tree:
-    */
-   nr_faces = _mesa_num_tex_faces(intelObj->base.Target);
-   for (face = 0; face < nr_faces; face++) {
-      for (i = tObj->BaseLevel; i <= intelObj->_MaxLevel; i++) {
-         struct intel_texture_image *intelImage =
-            intel_texture_image(intelObj->base.Image[face][i]);
-	 /* skip too small size mipmap */
- 	 if (intelImage == NULL)
-		 break;
-
-         if (intelObj->mt != intelImage->mt) {
-            intel_miptree_copy_teximage(intel, intelImage, intelObj->mt,
-                                        false /* invalidate */);
-         }
-
-         /* After we're done, we'd better agree that our layout is
-          * appropriate, or we'll end up hitting this function again on the
-          * next draw
-          */
-         assert(intel_miptree_match_image(intelObj->mt, &intelImage->base.Base));
-      }
-   }
-
-   intelObj->needs_validate = false;
-
-   return true;
-}