fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 13:10:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

g3dvl: Update softlinks to nouveau winsys files, related fixes.

Browse source
This commit is contained in:
Younes Manton 2008-09-12 13:22:43 -04:00
parent ca0efa84ed
commit 59f23e92e2
24 changed files with 101 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c
View file

@ -6,10 +6,10 @@
#include <pipe/p_winsys.h>
#include <pipe/p_screen.h>
#include <pipe/p_state.h>
#include <pipe/p_util.h>
#include <pipe/p_inlines.h>
#include <tgsi/tgsi_parse.h>
#include <tgsi/tgsi_build.h>
#include <util/u_math.h>
#include "vl_render.h"
#include "vl_shader_build.h"
#include "vl_surface.h"

2
src/gallium/winsys/g3dvl/nouveau/nouveau_bo.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_bo.c
../../drm/nouveau/nouveau_bo.c

2
src/gallium/winsys/g3dvl/nouveau/nouveau_channel.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_channel.c
../../drm/nouveau/nouveau_channel.c

37
src/gallium/winsys/g3dvl/nouveau/nouveau_context.c
View file

@ -1,7 +1,7 @@
#include "pipe/p_defines.h"
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
#include "pipe/p_util.h"
#include "util/u_memory.h"
#include "nouveau_context.h"
#include "nouveau_dri.h"
@ -150,7 +150,7 @@ nouveau_context_create(dri_context_t *dri_context)
fb_bo = calloc(1, sizeof(struct nouveau_bo_priv));
fb_bo->drm.offset = nv_screen->front_offset;
fb_bo->drm.flags = NOUVEAU_MEM_FB;
fb_bo->drm.size = nv_screen->front_pitch *
fb_bo->drm.size = nv_screen->front_pitch *
nv_screen->front_height;
fb_bo->refcount = 1;
fb_bo->base.flags = NOUVEAU_BO_PIN | NOUVEAU_BO_VRAM;
@ -280,7 +280,7 @@ nouveau_context_bind(struct nouveau_context *nv, dri_drawable_t *dri_drawable)
{
assert(nv);
assert(dri_drawable);
if (nv->dri_drawable != dri_drawable)
{
nv->dri_drawable = dri_drawable;
@ -294,9 +294,9 @@ int
nouveau_context_unbind(struct nouveau_context *nv)
{
assert(nv);
nv->dri_drawable = NULL;
return 0;
}
@ -306,20 +306,20 @@ int bind_pipe_drawable(struct pipe_context *pipe, Drawable drawable)
{
struct nouveau_context *nv;
dri_drawable_t *dri_drawable;
nv = pipe->priv;
driCreateDrawable(nv->nv_screen->dri_screen, drawable, &dri_drawable);
nouveau_context_bind(nv, dri_drawable);
return 0;
}
int unbind_pipe_drawable(struct pipe_context *pipe)
{
nouveau_context_unbind(pipe->priv);
return 0;
}
@ -329,15 +329,15 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
dri_framebuffer_t dri_framebuf;
dri_context_t *dri_context;
struct nouveau_context *nv;
driCreateScreen(display, screen, &dri_screen, &dri_framebuf);
driCreateContext(dri_screen, XDefaultVisual(display, screen), &dri_context);
nouveau_screen_create(dri_screen, &dri_framebuf);
nouveau_context_create(dri_context);
nv = dri_context->private;
return nv->nvc->pctx[nv->pctx_id];
}
@ -348,15 +348,15 @@ int destroy_pipe_context(struct pipe_context *pipe)
struct nouveau_context *nv;
dri_screen_t *dri_screen;
dri_context_t *dri_context;
assert(pipe);
screen = pipe->screen;
winsys = pipe->winsys;
nv = pipe->priv;
dri_context = nv->dri_context;
dri_screen = dri_context->dri_screen;
pipe->destroy(pipe);
screen->destroy(screen);
free(winsys);
@ -365,7 +365,6 @@ int destroy_pipe_context(struct pipe_context *pipe)
nouveau_screen_destroy(dri_screen);
driDestroyContext(dri_context);
driDestroyScreen(dri_screen);
return 0;
}

2
src/gallium/winsys/g3dvl/nouveau/nouveau_device.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_device.c
../../drm/nouveau/nouveau_device.c

2
src/gallium/winsys/g3dvl/nouveau/nouveau_dma.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_dma.c
../../drm/nouveau/nouveau_dma.c

2
src/gallium/winsys/g3dvl/nouveau/nouveau_dma.h
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_dma.h
../../drm/nouveau/nouveau_dma.h

2
src/gallium/winsys/g3dvl/nouveau/nouveau_dri.h
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_dri.h
../../drm/nouveau/nouveau_dri.h

2
src/gallium/winsys/g3dvl/nouveau/nouveau_drmif.h
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_drmif.h
../../drm/nouveau/nouveau_drmif.h

2
src/gallium/winsys/g3dvl/nouveau/nouveau_fence.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_fence.c
../../drm/nouveau/nouveau_fence.c

2
src/gallium/winsys/g3dvl/nouveau/nouveau_grobj.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_grobj.c
../../drm/nouveau/nouveau_grobj.c

2
src/gallium/winsys/g3dvl/nouveau/nouveau_local.h
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_local.h
../../drm/nouveau/nouveau_local.h

2
src/gallium/winsys/g3dvl/nouveau/nouveau_notifier.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_notifier.c
../../drm/nouveau/nouveau_notifier.c

2
src/gallium/winsys/g3dvl/nouveau/nouveau_pushbuf.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_pushbuf.c
../../drm/nouveau/nouveau_pushbuf.c

2
src/gallium/winsys/g3dvl/nouveau/nouveau_resource.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_resource.c
../../drm/nouveau/nouveau_resource.c

13
src/gallium/winsys/g3dvl/nouveau/nouveau_screen.c
View file

@ -1,5 +1,5 @@
#include "pipe/p_context.h"
#include "pipe/p_util.h"
#include "util/u_memory.h"
#include "nouveau_context.h"
#include <nouveau_drm.h>
#include "nouveau_dri.h"
@ -23,11 +23,11 @@ int nouveau_check_dri_drm_ddx(dri_version_t *dri, dri_version_t *drm, dri_versio
static const dri_version_t ddx_expected = {0, 0, NOUVEAU_DRM_HEADER_PATCHLEVEL};
static const dri_version_t dri_expected = {4, 0, 0};
static const dri_version_t drm_expected = {0, 0, NOUVEAU_DRM_HEADER_PATCHLEVEL};
assert(dri);
assert(drm);
assert(ddx);
if (dri->major != dri_expected.major || dri->minor < dri_expected.minor)
{
NOUVEAU_ERR("Unexpected DRI version.\n");
@ -43,17 +43,17 @@ int nouveau_check_dri_drm_ddx(dri_version_t *dri, dri_version_t *drm, dri_versio
NOUVEAU_ERR("Unexpected DDX version.\n");
return 1;
}
return 0;
}
int
nouveau_screen_create(dri_screen_t *dri_screen, dri_framebuffer_t *dri_framebuf)
{
{
struct nouveau_dri *nv_dri = dri_framebuf->private;
struct nouveau_screen *nv_screen;
int ret;
if (nouveau_check_dri_drm_ddx(&dri_screen->dri, &dri_screen->drm, &dri_screen->ddx))
return 1;
@ -89,4 +89,3 @@ nouveau_screen_destroy(dri_screen_t *dri_screen)
FREE(nv_screen);
}

2
src/gallium/winsys/g3dvl/nouveau/nouveau_winsys.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_winsys.c
../../drm/nouveau/nouveau_winsys.c

11
src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.c
View file

@ -1,7 +1,7 @@
#include "pipe/p_winsys.h"
#include "pipe/p_defines.h"
#include "pipe/p_util.h"
#include "pipe/p_inlines.h"
#include "util/u_memory.h"
#include "nouveau_context.h"
#include "nouveau_local.h"
@ -29,7 +29,7 @@ static struct pipe_surface *
nouveau_surface_alloc(struct pipe_winsys *ws)
{
struct pipe_surface *surf;
surf = CALLOC_STRUCT(pipe_surface);
if (!surf)
return NULL;
@ -59,10 +59,10 @@ nouveau_surface_alloc_storage
)
{
const unsigned int ALIGNMENT = 256;
assert(pws);
assert(surface);
surface->width = width;
surface->height = height;
surface->format = format;
@ -72,7 +72,7 @@ nouveau_surface_alloc_storage
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;
}
@ -258,4 +258,3 @@ nouveau_create_pipe_winsys(struct nouveau_context *nv)
return &nvpws->pws;
}

2
src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_pipe.h
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_winsys_pipe.h
../../drm/nouveau/nouveau_winsys_pipe.h

2
src/gallium/winsys/g3dvl/nouveau/nouveau_winsys_softpipe.c
View file

@ -1 +1 @@
../../dri/nouveau/nouveau_winsys_softpipe.c
../../drm/nouveau/nouveau_winsys_softpipe.c

2
src/gallium/winsys/g3dvl/nouveau/nv04_surface.c
View file

@ -1 +1 @@
../../dri/nouveau/nv04_surface.c
../../drm/nouveau/nv04_surface.c

2
src/gallium/winsys/g3dvl/nouveau/nv50_surface.c
View file

@ -1 +1 @@
../../dri/nouveau/nv50_surface.c
../../drm/nouveau/nv50_surface.c

105
src/gallium/winsys/g3dvl/xsp_winsys.c
View file

@ -2,8 +2,8 @@
#include <X11/Xutil.h>
#include <pipe/p_winsys.h>
#include <pipe/p_state.h>
#include <pipe/p_util.h>
#include <pipe/p_inlines.h>
#include <util/u_memory.h>
#include <softpipe/sp_winsys.h>
/* pipe_winsys implementation */
@ -33,79 +33,79 @@ struct xsp_buffer
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));
buffer->base.refcount = 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));
buffer->base.refcount = 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_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;
}
@ -127,10 +127,10 @@ static int xsp_surface_alloc_storage
)
{
const unsigned int ALIGNMENT = 1;
assert(pws);
assert(surface);
surface->width = width;
surface->height = height;
surface->format = format;
@ -140,28 +140,28 @@ static int xsp_surface_alloc_storage
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)
{
pipe_buffer_reference(pws, &s->buffer, NULL);
free(s);
}
*surface = NULL;
}
@ -176,7 +176,7 @@ static int xsp_fence_signalled(struct pipe_winsys *pws, struct pipe_fence_handle
{
assert(pws);
assert(fence);
return 0;
}
@ -184,30 +184,30 @@ static int xsp_fence_finish(struct pipe_winsys *pws, struct pipe_fence_handle *f
{
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 = pipe_surface_map(surface, 0);
XPutImage
(
xsp_context->display,
@ -236,25 +236,25 @@ static const char* xsp_get_name(struct pipe_winsys *pws)
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;
}
@ -264,9 +264,9 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
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;
@ -281,7 +281,7 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
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
@ -299,22 +299,22 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
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, (struct pipe_winsys*)xsp_winsys, NULL);
xsp_context = calloc(1, sizeof(struct xsp_context));
xsp_context->display = display;
xsp_context->screen = screen;
sp_pipe->priv = xsp_context;
return sp_pipe;
}
@ -322,16 +322,15 @@ 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;
}

2
src/libXvMC/Makefile
View file

@ -47,7 +47,7 @@ endif
all: ${TARGET}
ifeq (${DRIVER}, softpipe)
${TARGET}: g3dvl
${TARGET}: ${OBJECTS} g3dvl
$(CC) ${LDFLAGS} -shared -Wl,-soname,${SONAME} -o $@ ${OBJECTS} ${LIBS}
g3dvl: