diff options
| author | Cooper Yuan <cooperyuan@gmail.com> | 2009-09-21 17:10:56 +0800 |
|---|---|---|
| committer | Cooper Yuan <cooperyuan@gmail.com> | 2009-09-21 17:10:56 +0800 |
| commit | 28fef30f1f30aacc003267b1c267f2e0e0bfe665 (patch) | |
| tree | 8ac5206e27b40f9a4292a64900a25e34ea016e0d /src/gallium/winsys | |
| parent | 3d97911277a764936252af0275e239bfef3848e7 (diff) | |
xvmc: fix build error by deleting some functions, should be added later
Diffstat (limited to 'src/gallium/winsys')
| -rw-r--r-- | src/gallium/winsys/g3dvl/radeon/Makefile | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/g3dvl/radeon/radeon_vl.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/winsys/g3dvl/radeon/Makefile b/src/gallium/winsys/g3dvl/radeon/Makefile index ff7546219..38853c2eb 100644 --- a/src/gallium/winsys/g3dvl/radeon/Makefile +++ b/src/gallium/winsys/g3dvl/radeon/Makefile @@ -8,7 +8,7 @@ OBJECTS = radeon_vl.o CFLAGS += -g -Wall -Werror=implicit-function-declaration -fPIC \ -I${GALLIUMDIR}/include \ -I${GALLIUMDIR}/winsys/g3dvl \ - -I${GALLIUMDIR}/winsys/drm/nouveau \ + -I${GALLIUMDIR}/winsys/drm/radeon/core \ -I${DRMDIR}/include \ -I${DRMDIR}/include/drm \ -I${DRMDIR}/include/nouveau \ @@ -27,7 +27,7 @@ LDFLAGS += -L${DRMDIR}/lib \ -L${GALLIUMDIR}/auxiliary/cso_cache \ -L${GALLIUMDIR}/drivers/r300 -LIBS += -lradeondrm -ldriclient -ldrm -lradeon -ldraw -ltgsi -ltranslate -lrtasm -lcso_cache -lm +LIBS += -ldriclient -ldrm -ldraw -ltgsi -ltranslate -lrtasm -lcso_cache -lm ############################################# diff --git a/src/gallium/winsys/g3dvl/radeon/radeon_vl.c b/src/gallium/winsys/g3dvl/radeon/radeon_vl.c index 63cc98a94..5c53b1a7f 100644 --- a/src/gallium/winsys/g3dvl/radeon/radeon_vl.c +++ b/src/gallium/winsys/g3dvl/radeon/radeon_vl.c @@ -28,8 +28,10 @@ #include <pipe/p_context.h> #include <pipe/p_screen.h> #include <util/u_memory.h> - -#include "radeon_drm.h" +#include "radeon_buffer.h" +#include "radeon_r300.h" +#include "radeon_winsys_softpipe.h" +#include "r300_screen.h" #include "radeon_vl.h" @@ -120,7 +122,6 @@ static void radeon_vl_screen_destroy(dri_screen_t *dri_screen) { struct nouveau_screen_vl *rvl_screen = dri_screen->private; - radeon_screen_cleanup(&rvl_screen->base); FREE(rvl_screen); } @@ -135,7 +136,7 @@ int bind_pipe_drawable(struct pipe_context *pipe, Drawable drawable) assert(pipe); rvl_ctx = pipe->priv; - driCreateDrawable(rvl_ctx->nv_screen->dri_screen, drawable, &dri_drawable); + radeon_vl_context_bind(rvl_ctx, dri_drawable); return 0; @@ -167,7 +168,6 @@ struct pipe_context* create_pipe_context(Display *display, int screen) rvl_ctx = dri_context->private; - return rvl_ctx->base.nvc->pctx[rvl_ctx->base.pctx_id]; } int destroy_pipe_context(struct pipe_context *pipe) @@ -183,7 +183,7 @@ int destroy_pipe_context(struct pipe_context *pipe) screen = pipe->screen; winsys = pipe->winsys; rvl_ctx = pipe->priv; - dri_context = rvl_ctx->dri_context; + dri_screen = dri_context->dri_screen; pipe->destroy(pipe); |