summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/g3dvl
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/winsys/g3dvl')
-rw-r--r--src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c35
-rw-r--r--src/gallium/winsys/g3dvl/xsp_winsys.c67
2 files changed, 27 insertions, 75 deletions
diff --git a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
index 17c409e1ce5..2d8463037f7 100644
--- a/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
+++ b/src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
@@ -46,34 +46,29 @@ round_up(unsigned n, unsigned multiple)
return (n + multiple - 1) & ~(multiple - 1);
}
-static int
-nouveau_surface_alloc_storage
+static struct pipe_buffer *
+nouveau_surface_buffer_create
(
struct pipe_winsys *pws,
- struct pipe_surface *surface,
unsigned width,
unsigned height,
enum pipe_format format,
- unsigned flags,
- unsigned tex_usage
+ unsigned usage,
+ unsigned *stride
)
{
const unsigned int ALIGNMENT = 256;
+ struct pipe_format_block block;
+ unsigned nblocksx, nblocksy;
- assert(pws);
- assert(surface);
-
- surface->width = width;
- surface->height = height;
- surface->format = format;
- pf_get_block(format, &surface->block);
- surface->nblocksx = pf_get_nblocksx(&surface->block, width);
- surface->nblocksy = pf_get_nblocksy(&surface->block, height);
- surface->stride = round_up(surface->nblocksx * surface->block.size, ALIGNMENT);
- surface->usage = flags;
- surface->buffer = pws->buffer_create(pws, ALIGNMENT, PIPE_BUFFER_USAGE_PIXEL, surface->stride * surface->nblocksy);
+ pf_get_block(format, &block);
+ nblocksx = pf_get_nblocksx(&block, width);
+ nblocksy = pf_get_nblocksy(&block, height);
+ *stride = round_up(nblocksx * block.size, ALIGNMENT);
- return 0;
+ return winsys->buffer_create(winsys, ALIGNMENT,
+ usage,
+ *stride * nblocksy);
}
static void
@@ -269,9 +264,7 @@ nouveau_create_pipe_winsys(struct nouveau_context *nv)
pws->flush_frontbuffer = nouveau_flush_frontbuffer;
- pws->surface_alloc = nouveau_surface_alloc;
- pws->surface_alloc_storage = nouveau_surface_alloc_storage;
- pws->surface_release = nouveau_surface_release;
+ pws->surface_buffer_create = nouveau_surface_buffer_create;
pws->buffer_create = nouveau_pipe_bo_create;
pws->buffer_destroy = nouveau_pipe_bo_del;
diff --git a/src/gallium/winsys/g3dvl/xsp_winsys.c b/src/gallium/winsys/g3dvl/xsp_winsys.c
index 68be2c2ea3a..40d683234fc 100644
--- a/src/gallium/winsys/g3dvl/xsp_winsys.c
+++ b/src/gallium/winsys/g3dvl/xsp_winsys.c
@@ -96,73 +96,34 @@ static void xsp_buffer_destroy(struct pipe_winsys *pws, struct pipe_buffer *buff
free(xsp_buf);
}
-static struct pipe_surface* xsp_surface_alloc(struct pipe_winsys *pws)
-{
- struct pipe_surface *surface;
-
- assert(pws);
-
- surface = calloc(1, sizeof(struct pipe_surface));
- surface->refcount = 1;
- surface->winsys = pws;
-
- return surface;
-}
-
/* Borrowed from Mesa's xm_winsys */
static unsigned int round_up(unsigned n, unsigned multiple)
{
return (n + multiple - 1) & ~(multiple - 1);
}
-static int xsp_surface_alloc_storage
+static struct pipe_buffer* xsp_surface_buffer_create
(
struct pipe_winsys *pws,
- struct pipe_surface *surface,
unsigned width,
unsigned height,
enum pipe_format format,
- unsigned flags,
- unsigned tex_usage
+ unsigned usage,
+ unsigned *stride
)
{
const unsigned int ALIGNMENT = 1;
+ struct pipe_format_block block;
+ unsigned nblocksx, nblocksy;
- assert(pws);
- assert(surface);
-
- surface->width = width;
- surface->height = height;
- surface->format = format;
- pf_get_block(format, &surface->block);
- surface->nblocksx = pf_get_nblocksx(&surface->block, width);
- surface->nblocksy = pf_get_nblocksy(&surface->block, height);
- surface->stride = round_up(surface->nblocksx * surface->block.size, ALIGNMENT);
- surface->usage = flags;
- surface->buffer = pws->buffer_create(pws, ALIGNMENT, PIPE_BUFFER_USAGE_PIXEL, surface->stride * surface->nblocksy);
-
- return 0;
-}
-
-static void xsp_surface_release(struct pipe_winsys *pws, struct pipe_surface **surface)
-{
- struct pipe_surface *s;
-
- assert(pws);
- assert(surface);
- assert(*surface);
-
- s = *surface;
-
- s->refcount--;
-
- if (s->refcount == 0)
- {
- winsys_buffer_reference(pws, &s->buffer, NULL);
- free(s);
- }
+ pf_get_block(format, &block);
+ nblocksx = pf_get_nblocksx(&block, width);
+ nblocksy = pf_get_nblocksy(&block, height);
+ *stride = round_up(nblocksx * block.size, ALIGNMENT);
- *surface = NULL;
+ return winsys->buffer_create(winsys, ALIGNMENT,
+ usage,
+ *stride * nblocksy);
}
static void xsp_fence_reference(struct pipe_winsys *pws, struct pipe_fence_handle **ptr, struct pipe_fence_handle *fence)
@@ -273,9 +234,7 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
xsp_winsys->base.buffer_map = xsp_buffer_map;
xsp_winsys->base.buffer_unmap = xsp_buffer_unmap;
xsp_winsys->base.buffer_destroy = xsp_buffer_destroy;
- xsp_winsys->base.surface_alloc = xsp_surface_alloc;
- xsp_winsys->base.surface_alloc_storage = xsp_surface_alloc_storage;
- xsp_winsys->base.surface_release = xsp_surface_release;
+ xsp_winsys->base.surface_buffer_create = xsp_surface_buffer_create;
xsp_winsys->base.fence_reference = xsp_fence_reference;
xsp_winsys->base.fence_signalled = xsp_fence_signalled;
xsp_winsys->base.fence_finish = xsp_fence_finish;