Remove "static region" support.

The frontbuffer/driBufMgr interactions are handled as a special case
in the intel_screen code.

diff --git a/src/mesa/drivers/dri/i915pipe/intel_regions.c b/src/mesa/drivers/dri/i915pipe/intel_regions.c
index f2280ceb515004c7f72e2f023ef55a1f9802c843..75ba1f9cdb00413a1374b04053503e248382f1d3 100644 (file)
--- a/src/mesa/drivers/dri/i915pipe/intel_regions.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_regions.c
@@ -139,68 +139,9 @@ intel_region_release(struct pipe_context *pipe, struct pipe_region **region)
 }
 
 
-static struct pipe_region *
-intel_region_create_static(struct pipe_context *pipe,
-                           GLuint mem_type,
-                           GLuint offset,
-                           void *virtual,
-                           GLuint cpp, GLuint pitch, GLuint height)
-{
-   intelScreenPrivate *intelScreen = pipe_screen(pipe);
-   struct pipe_region *region = calloc(sizeof(*region), 1);
-   DBG("%s\n", __FUNCTION__);
-
-   region->cpp = cpp;
-   region->pitch = pitch;
-   region->height = height;     /* needed? */
-   region->refcount = 1;
-
-   /*
-    * We use a "shared" buffer type to indicate buffers created and
-    * shared by others.
-    */
-
-   driGenBuffers(intelScreen->staticPool, "static region", 1,
-                 &region->buffer, 64,
-                 DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_NO_MOVE |
-                 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE, 0);
-   driBOSetStatic(region->buffer, offset, pitch * cpp * height, virtual, 0);
-
-   return region;
-}
 
 
 
-static void
-intel_region_update_static(struct pipe_context *pipe,
-                          struct pipe_region *region,
-                           GLuint mem_type,
-                           GLuint offset,
-                           void *virtual,
-                           GLuint cpp, GLuint pitch, GLuint height)
-{
-   intelScreenPrivate *intelScreen = pipe_screen(pipe);
-
-   DBG("%s\n", __FUNCTION__);
-
-   region->cpp = cpp;
-   region->pitch = pitch;
-   region->height = height;     /* needed? */
-
-   /*
-    * We use a "shared" buffer type to indicate buffers created and
-    * shared by others.
-    */
-
-   driDeleteBuffers(1, &region->buffer);
-   driGenBuffers(intelScreen->staticPool, "static region", 1,
-                 &region->buffer, 64,
-                 DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_NO_MOVE |
-                 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE, 0);
-   driBOSetStatic(region->buffer, offset, pitch * cpp * height, virtual, 0);
-
-}
-
 
 
 /*
@@ -349,8 +290,6 @@ intel_init_region_functions(struct pipe_context *pipe)
    pipe->region_unmap = intel_region_unmap;
    pipe->region_alloc = intel_region_alloc;
    pipe->region_release = intel_region_release;
-   pipe->region_create_static = intel_region_create_static;
-   pipe->region_update_static = intel_region_update_static;
    pipe->region_data = intel_region_data;
    pipe->region_copy = intel_region_copy;
    pipe->region_fill = intel_region_fill;

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 7acaabbdfd07cd3df90a1940b7fde0a9869bcec6..ac6567f009b39c79bbadf55d7d18bf5d5382c139 100644 (file)
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -144,20 +144,6 @@ struct pipe_context {
 
    void (*region_release)(struct pipe_context *pipe, struct pipe_region **r);
 
-   struct pipe_region *(*region_create_static)(struct pipe_context *pipe,
-                                               GLuint mem_type,
-                                               GLuint offset,
-                                               void *virtual,
-                                               GLuint cpp, GLuint pitch,
-                                               GLuint height);
-
-   void (*region_update_static)(struct pipe_context *pipe,
-                                struct pipe_region *region,
-                                GLuint mem_type,
-                                GLuint offset,
-                                void *virtual,
-                                GLuint cpp, GLuint pitch, GLuint height);
-
    void (*region_idle)(struct pipe_context *pipe, struct pipe_region *region);
 
    GLubyte *(*region_map)(struct pipe_context *pipe, struct pipe_region *r);