mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-06 15:58:05 +02:00
winsys/xlib: sketch of cell support
This commit is contained in:
Keith Whitwell
parent
3b6a991728
commit
9b7c332d5f
1 changed files with 21 additions and 249 deletions
|
|
@ -32,99 +32,20 @@
|
|||
* Brian Paul
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
#include "xlib.h"
|
||||
|
||||
#ifdef GALLIUM_CELL
|
||||
|
||||
#include "xm_api.h"
|
||||
#if defined(GALLIUM_CELL)
|
||||
|
||||
#undef ASSERT
|
||||
#undef Elements
|
||||
|
||||
#include "util/u_simple_screen.h"
|
||||
#include "pipe/p_format.h"
|
||||
#include "pipe/p_context.h"
|
||||
#include "util/u_inlines.h"
|
||||
#include "util/u_format.h"
|
||||
#include "util/u_math.h"
|
||||
#include "util/u_memory.h"
|
||||
|
||||
#include "cell/ppu/cell_context.h"
|
||||
#include "cell/ppu/cell_screen.h"
|
||||
#include "cell/ppu/cell_winsys.h"
|
||||
#include "cell/ppu/cell_texture.h"
|
||||
#include "cell/ppu/cell_screen.h"
|
||||
#include "state_tracker/sw_winsys.h"
|
||||
#include "util/u_debug.h"
|
||||
|
||||
|
||||
/**
|
||||
* Subclass of pipe_buffer for Xlib winsys.
|
||||
* Low-level OS/window system memory buffer
|
||||
*/
|
||||
struct xm_buffer
|
||||
{
|
||||
struct pipe_buffer base;
|
||||
boolean userBuffer; /** Is this a user-space buffer? */
|
||||
void *data;
|
||||
void *mapped;
|
||||
|
||||
XImage *tempImage;
|
||||
int shm;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Subclass of pipe_winsys for Xlib winsys
|
||||
*/
|
||||
struct xmesa_pipe_winsys
|
||||
{
|
||||
struct pipe_winsys base;
|
||||
};
|
||||
|
||||
|
||||
|
||||
/** Cast wrapper */
|
||||
static INLINE struct xm_buffer *
|
||||
xm_buffer( struct pipe_buffer *buf )
|
||||
{
|
||||
return (struct xm_buffer *)buf;
|
||||
}
|
||||
|
||||
|
||||
/* Most callbacks map direcly onto dri_bufmgr operations:
|
||||
*/
|
||||
static void *
|
||||
xm_buffer_map(struct pipe_winsys *pws, struct pipe_buffer *buf,
|
||||
unsigned flags)
|
||||
{
|
||||
struct xm_buffer *xm_buf = xm_buffer(buf);
|
||||
xm_buf->mapped = xm_buf->data;
|
||||
return xm_buf->mapped;
|
||||
}
|
||||
|
||||
static void
|
||||
xm_buffer_unmap(struct pipe_winsys *pws, struct pipe_buffer *buf)
|
||||
{
|
||||
struct xm_buffer *xm_buf = xm_buffer(buf);
|
||||
xm_buf->mapped = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
xm_buffer_destroy(/*struct pipe_winsys *pws,*/
|
||||
struct pipe_buffer *buf)
|
||||
{
|
||||
struct xm_buffer *oldBuf = xm_buffer(buf);
|
||||
|
||||
if (oldBuf) {
|
||||
if (oldBuf->data) {
|
||||
if (!oldBuf->userBuffer) {
|
||||
align_free(oldBuf->data);
|
||||
}
|
||||
|
||||
oldBuf->data = NULL;
|
||||
}
|
||||
free(oldBuf);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* For Cell. Basically, rearrange the pixels/quads from this layout:
|
||||
|
|
@ -155,15 +76,16 @@ twiddle_tile(const uint *tileIn, uint *tileOut)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Display a surface that's in a tiled configuration. That is, all the
|
||||
* pixels for a TILE_SIZExTILE_SIZE block are contiguous in memory.
|
||||
*/
|
||||
static void
|
||||
xlib_cell_display_surface(struct xmesa_buffer *b, struct pipe_surface *surf)
|
||||
xm_displaytarget_display(struct sw_winsys *ws,
|
||||
struct sw_displaytarget *dt,
|
||||
void *winsys_drawable)
|
||||
{
|
||||
struct xmesa_buffer *xm_buffer = (struct xm_drawable *)winsys_drawable;
|
||||
XImage *ximage;
|
||||
struct xm_buffer *xm_buf = xm_buffer(
|
||||
cell_texture(surf->texture)->buffer);
|
||||
|
|
@ -210,165 +132,21 @@ xlib_cell_display_surface(struct xmesa_buffer *b, struct pipe_surface *surf)
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
static void
|
||||
xm_flush_frontbuffer(struct pipe_winsys *pws,
|
||||
struct pipe_surface *surf,
|
||||
void *context_private)
|
||||
{
|
||||
/*
|
||||
* The front color buffer is actually just another XImage buffer.
|
||||
* This function copies that XImage to the actual X Window.
|
||||
*/
|
||||
XMesaContext xmctx = (XMesaContext) context_private;
|
||||
if (xmctx)
|
||||
xlib_cell_display_surface(xmctx->xm_buffer, surf);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static const char *
|
||||
xm_get_name(struct pipe_winsys *pws)
|
||||
{
|
||||
return "Xlib/Cell";
|
||||
}
|
||||
|
||||
|
||||
static struct pipe_buffer *
|
||||
xm_buffer_create(struct pipe_winsys *pws,
|
||||
unsigned alignment,
|
||||
unsigned usage,
|
||||
unsigned size)
|
||||
{
|
||||
struct xm_buffer *buffer = CALLOC_STRUCT(xm_buffer);
|
||||
|
||||
pipe_reference_init(&buffer->base.reference, 1);
|
||||
buffer->base.alignment = alignment;
|
||||
buffer->base.usage = usage;
|
||||
buffer->base.size = size;
|
||||
|
||||
|
||||
if (buffer->data == NULL) {
|
||||
buffer->shm = 0;
|
||||
|
||||
/* align to 16-byte multiple for Cell */
|
||||
buffer->data = align_malloc(size, max(alignment, 16));
|
||||
}
|
||||
|
||||
return &buffer->base;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Create buffer which wraps user-space data.
|
||||
*/
|
||||
static struct pipe_buffer *
|
||||
xm_user_buffer_create(struct pipe_winsys *pws, void *ptr, unsigned bytes)
|
||||
{
|
||||
struct xm_buffer *buffer = CALLOC_STRUCT(xm_buffer);
|
||||
pipe_reference_init(&buffer->base.reference, 1);
|
||||
buffer->base.size = bytes;
|
||||
buffer->userBuffer = TRUE;
|
||||
buffer->data = ptr;
|
||||
buffer->shm = 0;
|
||||
|
||||
return &buffer->base;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static struct pipe_buffer *
|
||||
xm_surface_buffer_create(struct pipe_winsys *winsys,
|
||||
unsigned width, unsigned height,
|
||||
enum pipe_format format,
|
||||
unsigned usage,
|
||||
unsigned tex_usage,
|
||||
unsigned *stride)
|
||||
{
|
||||
const unsigned alignment = 64;
|
||||
unsigned nblocksy;
|
||||
|
||||
nblocksy = util_format_get_nblocksy(format, height);
|
||||
*stride = align(util_format_get_stride(format, width), alignment);
|
||||
|
||||
return winsys->buffer_create(winsys, alignment,
|
||||
usage,
|
||||
/* XXX a bit of a hack */
|
||||
*stride * align(nblocksy, TILE_SIZE));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Fence functions - basically nothing to do, as we don't create any actual
|
||||
* fence objects.
|
||||
*/
|
||||
|
||||
static void
|
||||
xm_fence_reference(struct pipe_winsys *sws, struct pipe_fence_handle **ptr,
|
||||
struct pipe_fence_handle *fence)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
xm_fence_signalled(struct pipe_winsys *sws, struct pipe_fence_handle *fence,
|
||||
unsigned flag)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
xm_fence_finish(struct pipe_winsys *sws, struct pipe_fence_handle *fence,
|
||||
unsigned flag)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static struct pipe_winsys *
|
||||
xlib_create_cell_winsys( void )
|
||||
{
|
||||
static struct xmesa_pipe_winsys *ws = NULL;
|
||||
|
||||
if (!ws) {
|
||||
ws = CALLOC_STRUCT(xmesa_pipe_winsys);
|
||||
|
||||
/* Fill in this struct with callbacks that pipe will need to
|
||||
* communicate with the window system, buffer manager, etc.
|
||||
*/
|
||||
ws->base.buffer_create = xm_buffer_create;
|
||||
ws->base.user_buffer_create = xm_user_buffer_create;
|
||||
ws->base.buffer_map = xm_buffer_map;
|
||||
ws->base.buffer_unmap = xm_buffer_unmap;
|
||||
ws->base.buffer_destroy = xm_buffer_destroy;
|
||||
|
||||
ws->base.surface_buffer_create = xm_surface_buffer_create;
|
||||
|
||||
ws->base.fence_reference = xm_fence_reference;
|
||||
ws->base.fence_signalled = xm_fence_signalled;
|
||||
ws->base.fence_finish = xm_fence_finish;
|
||||
|
||||
ws->base.flush_frontbuffer = xm_flush_frontbuffer;
|
||||
ws->base.get_name = xm_get_name;
|
||||
}
|
||||
|
||||
return &ws->base;
|
||||
}
|
||||
|
||||
|
||||
static struct pipe_screen *
|
||||
xlib_create_cell_screen( void )
|
||||
xlib_create_cell_screen( Display *dpy )
|
||||
{
|
||||
struct pipe_winsys *winsys;
|
||||
struct sw_winsys *winsys;
|
||||
struct pipe_screen *screen;
|
||||
|
||||
winsys = xlib_create_cell_winsys();
|
||||
winsys = xlib_create_sw_winsys( dpy );
|
||||
if (winsys == NULL)
|
||||
return NULL;
|
||||
|
||||
/* Plug in a little cell-specific code:
|
||||
*/
|
||||
|
||||
ws->base.displaytarget_display = xm_cell_displaytarget_display;
|
||||
|
||||
screen = cell_create_screen(winsys);
|
||||
if (screen == NULL)
|
||||
goto fail;
|
||||
|
|
@ -384,18 +162,12 @@ fail:
|
|||
|
||||
|
||||
|
||||
|
||||
struct xm_driver xlib_cell_driver =
|
||||
{
|
||||
.create_pipe_screen = xlib_create_cell_screen,
|
||||
.display_surface = xlib_cell_display_surface,
|
||||
};
|
||||
|
||||
#else
|
||||
|
||||
struct xm_driver xlib_cell_driver =
|
||||
{
|
||||
.create_pipe_screen = NULL,
|
||||
.display_surface = NULL,
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif /* GALLIUM_CELL */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue