1 files changed, 0 insertions, 291 deletions
diff --git a/src/gallium/winsys/g3dvl/xsp_winsys.c b/src/gallium/winsys/g3dvl/xsp_winsys.c
deleted file mode 100644
index 37d60ce540..0000000000
--- a/src/gallium/winsys/g3dvl/xsp_winsys.c
+++ /dev/null
@@ -1,291 +0,0 @@
-#include "vl_winsys.h"
-#include <X11/Xutil.h>
-#include <pipe/internal/p_winsys_screen.h>
-#include <pipe/p_state.h>
-#include <pipe/p_inlines.h>
-#include <util/u_memory.h>
-#include <util/u_math.h>
-#include <softpipe/sp_winsys.h>
-#include <softpipe/sp_texture.h>
-
-/* pipe_winsys implementation */
-
-struct xsp_pipe_winsys
-{
-	struct pipe_winsys	base;
-	XImage			fbimage;
-};
-
-struct xsp_context
-{
-	Display			*display;
-	int			screen;
-	Drawable		drawable;
-	int			drawable_bound;
-};
-
-struct xsp_buffer
-{
-	struct pipe_buffer	base;
-	boolean			is_user_buffer;
-	void			*data;
-	void			*mapped_data;
-};
-
-static struct pipe_buffer* xsp_buffer_create(struct pipe_winsys *pws, unsigned alignment, unsigned usage, unsigned size)
-{
-	struct xsp_buffer *buffer;
-
-	assert(pws);
-
-	buffer = calloc(1, sizeof(struct xsp_buffer));
-	pipe_reference_init(&buffer->base.reference, 1);
-	buffer->base.alignment = alignment;
-	buffer->base.usage = usage;
-	buffer->base.size = size;
-	buffer->data = align_malloc(size, alignment);
-
-	return (struct pipe_buffer*)buffer;
-}
-
-static struct pipe_buffer* xsp_user_buffer_create(struct pipe_winsys *pws, void *data, unsigned size)
-{
-	struct xsp_buffer *buffer;
-
-	assert(pws);
-
-	buffer = calloc(1, sizeof(struct xsp_buffer));
-	pipe_reference_init(&buffer->base.reference, 1);
-	buffer->base.size = size;
-	buffer->is_user_buffer = TRUE;
-	buffer->data = data;
-
-	return (struct pipe_buffer*)buffer;
-}
-
-static void* xsp_buffer_map(struct pipe_winsys *pws, struct pipe_buffer *buffer, unsigned flags)
-{
-	struct xsp_buffer *xsp_buf = (struct xsp_buffer*)buffer;
-
-	assert(pws);
-	assert(buffer);
-
-	xsp_buf->mapped_data = xsp_buf->data;
-
-	return xsp_buf->mapped_data;
-}
-
-static void xsp_buffer_unmap(struct pipe_winsys *pws, struct pipe_buffer *buffer)
-{
-	struct xsp_buffer *xsp_buf = (struct xsp_buffer*)buffer;
-
-	assert(pws);
-	assert(buffer);
-
-	xsp_buf->mapped_data = NULL;
-}
-
-static void xsp_buffer_destroy(struct pipe_winsys *pws, struct pipe_buffer *buffer)
-{
-	struct xsp_buffer *xsp_buf = (struct xsp_buffer*)buffer;
-
-	assert(pws);
-	assert(buffer);
-
-	if (!xsp_buf->is_user_buffer)
-		align_free(xsp_buf->data);
-
-	free(xsp_buf);
-}
-
-static struct pipe_buffer* xsp_surface_buffer_create
-(
-	struct pipe_winsys *pws,
-	unsigned width,
-	unsigned height,
-	enum pipe_format format,
-	unsigned usage,
-	unsigned tex_usage,
-	unsigned *stride
-)
-{
-	const unsigned int ALIGNMENT = 1;
-	struct pipe_format_block block;
-	unsigned nblocksx, nblocksy;
-
-	pf_get_block(format, &block);
-	nblocksx = pf_get_nblocksx(&block, width);
-	nblocksy = pf_get_nblocksy(&block, height);
-	*stride = align(nblocksx * block.size, ALIGNMENT);
-
-	return pws->buffer_create(pws, ALIGNMENT,
-				  usage,
-				  *stride * nblocksy);
-}
-
-static void xsp_fence_reference(struct pipe_winsys *pws, struct pipe_fence_handle **ptr, struct pipe_fence_handle *fence)
-{
-	assert(pws);
-	assert(ptr);
-	assert(fence);
-}
-
-static int xsp_fence_signalled(struct pipe_winsys *pws, struct pipe_fence_handle *fence, unsigned flag)
-{
-	assert(pws);
-	assert(fence);
-
-	return 0;
-}
-
-static int xsp_fence_finish(struct pipe_winsys *pws, struct pipe_fence_handle *fence, unsigned flag)
-{
-	assert(pws);
-	assert(fence);
-
-	return 0;
-}
-
-static void xsp_flush_frontbuffer(struct pipe_winsys *pws, struct pipe_surface *surface, void *context_private)
-{
-	struct xsp_pipe_winsys	*xsp_winsys;
-	struct xsp_context	*xsp_context;
-
-	assert(pws);
-	assert(surface);
-	assert(context_private);
-
-	xsp_winsys = (struct xsp_pipe_winsys*)pws;
-	xsp_context = (struct xsp_context*)context_private;
-
-	if (!xsp_context->drawable_bound)
-		return;
-
-	xsp_winsys->fbimage.width = surface->width;
-	xsp_winsys->fbimage.height = surface->height;
-	xsp_winsys->fbimage.bytes_per_line = surface->width * (xsp_winsys->fbimage.bits_per_pixel >> 3);
-	xsp_winsys->fbimage.data = ((struct xsp_buffer *)softpipe_texture(surface->texture)->buffer)->data + surface->offset;
-
-	XPutImage
-	(
-		xsp_context->display,
-		xsp_context->drawable,
-		XDefaultGC(xsp_context->display, xsp_context->screen),
-		&xsp_winsys->fbimage,
-		0,
-		0,
-		0,
-		0,
-		surface->width,
-		surface->height
-	);
-	XFlush(xsp_context->display);
-}
-
-static const char* xsp_get_name(struct pipe_winsys *pws)
-{
-	assert(pws);
-	return "X11 SoftPipe";
-}
-
-/* Show starts here */
-
-int bind_pipe_drawable(struct pipe_context *pipe, Drawable drawable)
-{
-	struct xsp_context *xsp_context;
-
-	assert(pipe);
-
-	xsp_context = pipe->priv;
-	xsp_context->drawable = drawable;
-	xsp_context->drawable_bound = 1;
-
-	return 0;
-}
-
-int unbind_pipe_drawable(struct pipe_context *pipe)
-{
-	struct xsp_context *xsp_context;
-
-	assert(pipe);
-
-	xsp_context = pipe->priv;
-	xsp_context->drawable_bound = 0;
-
-	return 0;
-}
-
-struct pipe_context* create_pipe_context(Display *display, int screen)
-{
-	struct xsp_pipe_winsys	*xsp_winsys;
-	struct xsp_context	*xsp_context;
-	struct pipe_screen	*sp_screen;
-	struct pipe_context	*sp_pipe;
-
-	assert(display);
-
-	xsp_winsys = calloc(1, sizeof(struct xsp_pipe_winsys));
-	xsp_winsys->base.buffer_create = xsp_buffer_create;
-	xsp_winsys->base.user_buffer_create = xsp_user_buffer_create;
-	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_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;
-	xsp_winsys->base.flush_frontbuffer = xsp_flush_frontbuffer;
-	xsp_winsys->base.get_name = xsp_get_name;
-
-	{
-		/* XXX: Can't use the returned XImage* directly,
-		since we don't have control over winsys destruction
-		and we wouldn't be able to free it */
-		XImage *template = XCreateImage
-		(
-			display,
-			XDefaultVisual(display, XDefaultScreen(display)),
-			XDefaultDepth(display, XDefaultScreen(display)),
-			ZPixmap,
-			0,
-			NULL,
-			0,	/* Don't know the width and height until flush_frontbuffer */
-			0,
-			32,
-			0
-		);
-
-		memcpy(&xsp_winsys->fbimage, template, sizeof(XImage));
-		XInitImage(&xsp_winsys->fbimage);
-
-		XDestroyImage(template);
-	}
-
-	sp_screen = softpipe_create_screen((struct pipe_winsys*)xsp_winsys);
-	sp_pipe = softpipe_create(sp_screen);
-
-	xsp_context = calloc(1, sizeof(struct xsp_context));
-	xsp_context->display = display;
-	xsp_context->screen = screen;
-
-	sp_pipe->priv = xsp_context;
-
-	return sp_pipe;
-}
-
-int destroy_pipe_context(struct pipe_context *pipe)
-{
-	struct pipe_screen *screen;
-	struct pipe_winsys *winsys;
-
-	assert(pipe);
-
-	screen = pipe->screen;
-	winsys = pipe->winsys;
-	free(pipe->priv);
-	pipe->destroy(pipe);
-	screen->destroy(screen);
-	free(winsys);
-
-	return 0;
-}