gbm: Add gbm_bo_write entry point

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

diff --git a/src/mesa/drivers/dri/intel/intel_regions.h b/src/mesa/drivers/dri/intel/intel_regions.h
index 6bbed32f2a29ac553ac02bf7a404c908abcaa22c..af3a059560a229ed96d65035bb276b4a43a16f8c 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_regions.h
+++ b/src/mesa/drivers/dri/intel/intel_regions.h
@@ -35,6 +35,7 @@
  * stored in a drm_intel_bo.
  */
 
+#include <stdbool.h>
 #include <xf86drm.h>
 
 #include "main/mtypes.h"
@@ -53,7 +54,7 @@ struct intel_buffer_object;
  */
 struct intel_region
 {
-   drm_intel_bo *buffer;  /**< buffer manager's buffer */
+   drm_intel_bo *bo;  /**< buffer manager's buffer */
    GLuint refcount; /**< Reference count for region */
    GLuint cpp;      /**< bytes per pixel */
    GLuint width;    /**< in pixels */
@@ -62,11 +63,7 @@ struct intel_region
    GLubyte *map;    /**< only non-NULL when region is actually mapped */
    GLuint map_refcount;  /**< Reference count for mapping */
 
-   GLuint draw_offset; /**< Offset of drawing address within the region */
-   GLuint draw_x, draw_y; /**< Offset of drawing within the region */
-
    uint32_t tiling; /**< Which tiling mode the region is in */
-   struct intel_buffer_object *pbo;     /* zero-copy uploads */
 
    uint32_t name; /**< Global name for the bo */
    struct intel_screen *screen;
@@ -76,18 +73,21 @@ struct intel_region
 /* Allocate a refcounted region.  Pointers to regions should only be
  * copied by calling intel_reference_region().
  */
-struct intel_region *intel_region_alloc(struct intel_context *intel,
+struct intel_region *intel_region_alloc(struct intel_screen *screen,
                                         uint32_t tiling,
                                        GLuint cpp, GLuint width,
                                         GLuint height,
-                                       GLboolean expect_accelerated_upload);
+                                       bool expect_accelerated_upload);
 
 struct intel_region *
-intel_region_alloc_for_handle(struct intel_context *intel,
+intel_region_alloc_for_handle(struct intel_screen *screen,
                              GLuint cpp,
                              GLuint width, GLuint height, GLuint pitch,
                              unsigned int handle, 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);
 
@@ -95,26 +95,20 @@ void intel_region_release(struct intel_region **ib);
 
 void intel_recreate_static_regions(struct intel_context *intel);
 
-/* Map/unmap regions.  This is refcounted also: 
+/**
+ * Map/unmap regions.  This is refcounted also:
+ *
+ * \param mode  bitmask of GL_MAP_READ_BIT, GL_MAP_WRITE_BIT
  */
-GLubyte *intel_region_map(struct intel_context *intel,
-                          struct intel_region *ib);
+void *intel_region_map(struct intel_context *intel,
+                      struct intel_region *ib,
+                      GLbitfield mode);
 
 void intel_region_unmap(struct intel_context *intel, struct intel_region *ib);
 
-
-/* Upload data to a rectangular sub-region
- */
-void intel_region_data(struct intel_context *intel,
-                       struct intel_region *dest,
-                       GLuint dest_offset,
-                       GLuint destx, GLuint desty,
-                       const void *src, GLuint src_stride,
-                       GLuint srcx, GLuint srcy, GLuint width, GLuint height);
-
 /* Copy rectangular sub-regions
  */
-GLboolean
+bool
 intel_region_copy(struct intel_context *intel,
                  struct intel_region *dest,
                  GLuint dest_offset,
@@ -122,23 +116,9 @@ intel_region_copy(struct intel_context *intel,
                  struct intel_region *src,
                  GLuint src_offset,
                  GLuint srcx, GLuint srcy, GLuint width, GLuint height,
-                 GLboolean flip,
+                 bool flip,
                  GLenum logicop);
 
-/* Helpers for zerocopy uploads, particularly texture image uploads:
- */
-void intel_region_attach_pbo(struct intel_context *intel,
-                             struct intel_region *region,
-                             struct intel_buffer_object *pbo);
-void intel_region_release_pbo(struct intel_context *intel,
-                              struct intel_region *region);
-void intel_region_cow(struct intel_context *intel,
-                      struct intel_region *region);
-
-drm_intel_bo *intel_region_buffer(struct intel_context *intel,
-                                 struct intel_region *region,
-                                 GLuint flag);
-
 void _mesa_copy_rect(GLubyte * dst,
                 GLuint cpp,
                 GLuint dst_pitch,
@@ -152,6 +132,8 @@ void _mesa_copy_rect(GLubyte * dst,
 struct __DRIimageRec {
    struct intel_region *region;
    GLenum internal_format;
+   uint32_t usage;
+   uint32_t dri_format;
    GLuint format;
    GLenum data_type;
    void *data;