intel: Add support for writing to our linear-temporary-CPU-map case.
authorEric Anholt <eric@anholt.net>
Wed, 3 Apr 2013 00:19:55 +0000 (17:19 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 8 Apr 2013 18:49:20 +0000 (11:49 -0700)
This will be used for handling updates of large textures.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>.
src/mesa/drivers/dri/intel/intel_mipmap_tree.c

index 66cadebc90555c1aacca25364dd318018da201a1..ffdaec5945cb4826e2128336d34c57898db4420d 100644 (file)
@@ -1347,9 +1347,30 @@ intel_miptree_unmap_blit(struct intel_context *intel,
                         unsigned int level,
                         unsigned int slice)
 {
-   assert(!(map->mode & GL_MAP_WRITE_BIT));
-
+   struct gl_context *ctx = &intel->ctx;
    drm_intel_bo_unmap(map->bo);
+
+   if (map->mode & GL_MAP_WRITE_BIT) {
+      unsigned int image_x, image_y;
+      int x = map->x;
+      int y = map->y;
+      intel_miptree_get_image_offset(mt, level, slice, &image_x, &image_y);
+      x += image_x;
+      y += image_y;
+
+      bool ok = intelEmitCopyBlit(intel,
+                                  mt->region->cpp,
+                                  map->stride, map->bo,
+                                  0, I915_TILING_NONE,
+                                  mt->region->pitch, mt->region->bo,
+                                  mt->offset, mt->region->tiling,
+                                  0, 0,
+                                  x, y,
+                                  map->w, map->h,
+                                  GL_COPY);
+      WARN_ONCE(!ok, "Failed to blit from linear temporary mapping");
+   }
+
    drm_intel_bo_unreference(map->bo);
 }