st/nine: Queries: Fix D3DISSUE_END behaviour.

[mesa.git] / src / gallium / drivers / i915 / i915_state_sampler.c

diff --git a/src/gallium/drivers/i915/i915_state_sampler.c b/src/gallium/drivers/i915/i915_state_sampler.c
index 86234fc4e5d58999f7c7262bd48cc9e7fd0e6e84..c874361dfd9659b3adb384babaf37debf1696a7e 100644 (file)
--- a/src/gallium/drivers/i915/i915_state_sampler.c
+++ b/src/gallium/drivers/i915/i915_state_sampler.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2003 VMware, Inc.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -63,7 +63,7 @@ static void update_map(struct i915_context *i915,
                        const struct i915_texture *tex,
                        const struct i915_sampler_state *sampler,
                        const struct pipe_sampler_view* view,
-                       uint state[2]);
+                       uint state[3]);
 
 
 
@@ -300,13 +300,25 @@ static void update_map(struct i915_context *i915,
                        const struct i915_texture *tex,
                        const struct i915_sampler_state *sampler,
                        const struct pipe_sampler_view* view,
-                       uint state[2])
+                       uint state[3])
 {
    const struct pipe_resource *pt = &tex->b.b;
-   uint format, pitch;
-   const uint width = pt->width0, height = pt->height0, depth = pt->depth0;
-   const uint num_levels = pt->last_level;
+   uint width = pt->width0, height = pt->height0, depth = pt->depth0;
+   int first_level = view->u.tex.first_level;
+   const uint num_levels = pt->last_level - first_level;
    unsigned max_lod = num_levels * 4;
+   bool is_npot = (!util_is_power_of_two(pt->width0) || !util_is_power_of_two(pt->height0)); 
+   uint format, pitch;
+
+   /*
+    * This is a bit messy. i915 doesn't support NPOT with mipmaps, but we can
+    * still texture from a single level. This is useful to make u_blitter work.
+    */
+   if (is_npot) {
+      width = u_minify(width, first_level);
+      height = u_minify(height, first_level);
+      max_lod = 1;
+   }
 
    assert(tex);
    assert(width);
@@ -341,6 +353,11 @@ static void update_map(struct i915_context *i915,
        | MS4_CUBE_FACE_ENA_MASK
        | ((max_lod) << MS4_MAX_LOD_SHIFT)
        | ((depth - 1) << MS4_VOLUME_DEPTH_SHIFT));
+
+   if (is_npot)
+      state[2] = i915_texture_offset(tex, first_level, 0);
+   else
+      state[2] = 0;
 }
 
 static void update_maps(struct i915_context *i915)