i965: Replace the region in DRIimage with just a BO pointer and stride.

[mesa.git] / src / mesa / drivers / dri / i965 / intel_regions.h

diff --git a/src/mesa/drivers/dri/i965/intel_regions.h b/src/mesa/drivers/dri/i965/intel_regions.h
index ff7a5f06fd2ae217ee37ee3fcad22cb903d92e36..13ed03ce584ce49e59d4b4d281aede8320a36dec 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_regions.h
+++ b/src/mesa/drivers/dri/i965/intel_regions.h
@@ -68,8 +68,6 @@ struct intel_region
    GLuint pitch;    /**< in bytes */
 
    uint32_t tiling; /**< Which tiling mode the region is in */
-
-   uint32_t name; /**< Global name for the bo */
 };
 
 
@@ -82,31 +80,11 @@ struct intel_region *intel_region_alloc(struct intel_screen *screen,
                                         GLuint height,
                                        bool expect_accelerated_upload);
 
-struct intel_region *
-intel_region_alloc_for_handle(struct intel_screen *screen,
-                             GLuint cpp,
-                             GLuint width, GLuint height, GLuint pitch,
-                             unsigned int handle, const char *name);
-
-struct intel_region *
-intel_region_alloc_for_fd(struct intel_screen *screen,
-                          GLuint cpp,
-                          GLuint width, GLuint height, GLuint pitch,
-                          GLuint size,
-                          int fd, const char *name);
-
-bool
-intel_region_flink(struct intel_region *region, uint32_t *name);
-
 void intel_region_reference(struct intel_region **dst,
                             struct intel_region *src);
 
 void intel_region_release(struct intel_region **ib);
 
-uint32_t
-intel_region_get_aligned_offset(const struct intel_region *region, uint32_t x,
-                                uint32_t y, bool map_stencil_as_y_tiled);
-
 /**
  * Used with images created with image_from_names
  * to help support planar images.
@@ -125,7 +103,8 @@ struct intel_image_format {
 };
 
 struct __DRIimageRec {
-   struct intel_region *region;
+   drm_intel_bo *bo;
+   uint32_t pitch; /**< in bytes */
    GLenum internal_format;
    uint32_t dri_format;
    GLuint format;