radeonsi: emit TA_BC_BASE_ADDR_HI for border color on CIK

[mesa.git] / src / gallium / drivers / i915 / i915_resource.h

diff --git a/src/gallium/drivers/i915/i915_resource.h b/src/gallium/drivers/i915/i915_resource.h
index 753bd266b1200be43b8bed721de0c68ce231823d..14eed2c4a7989f8d033dac2b8bbbe3e88d2d4b2a 100644 (file)
--- a/src/gallium/drivers/i915/i915_resource.h
+++ b/src/gallium/drivers/i915/i915_resource.h
@@ -45,11 +45,24 @@ struct i915_buffer {
    boolean free_on_destroy;
 };
 
-#define I915_MAX_TEXTURE_2D_LEVELS 11  /* max 1024x1024 */
-#define I915_MAX_TEXTURE_3D_LEVELS  8  /* max 128x128x128 */
 
+/* Texture transfer. */
+struct i915_transfer {
+   /* Base class. */
+   struct pipe_transfer b;
+   struct pipe_resource *staging_texture;
+};
+
+
+#define I915_MAX_TEXTURE_2D_LEVELS 12  /* max 2048x2048 */
+#define I915_MAX_TEXTURE_3D_LEVELS  9  /* max 256x256x256 */
 
 
+struct offset_pair {
+       unsigned short nblocksx;
+       unsigned short nblocksy;
+};
+
 struct i915_texture {
    struct u_resource b;
 
@@ -63,14 +76,18 @@ struct i915_texture {
 
    /* Explicitly store the offset of each image for each cube face or
     * depth value.
+    *
+    * Array [depth] off offsets.
     */
-   unsigned *image_offset[I915_MAX_TEXTURE_2D_LEVELS];   /**< array [depth] of offsets */
+   struct offset_pair *image_offset[I915_MAX_TEXTURE_2D_LEVELS];
 
    /* The data is held here:
     */
    struct i915_winsys_buffer *buffer;
 };
 
+unsigned i915_texture_offset(struct i915_texture *tex,
+                             unsigned level, unsigned layer);
 void i915_init_screen_resource_functions(struct i915_screen *is);
 void i915_init_resource_functions(struct i915_context *i915);
 
@@ -93,7 +110,8 @@ static INLINE struct i915_buffer *i915_buffer(struct pipe_resource *resource)
 
 struct pipe_resource *
 i915_texture_create(struct pipe_screen *screen,
-                    const struct pipe_resource *template);
+                    const struct pipe_resource *template,
+                    boolean force_untiled);
 
 struct pipe_resource *
 i915_texture_from_handle(struct pipe_screen * screen,