diff options
| author | root <root@localhost.localdomain> | 2009-09-22 03:34:15 -0400 |
|---|---|---|
| committer | root <root@localhost.localdomain> | 2009-09-22 03:34:15 -0400 |
| commit | 4e21acae9c4f23c6b1e4a1b4f897d771a5c8c752 (patch) | |
| tree | 1f911e4a98f5c6b60e0b8196167a31091607b7db | |
| parent | 34b8d551284bb29e2b6077ac0cef41675d865e0a (diff) | |
xvmc: link to libradeonwinsys.a in order to use radeon_create_r300_winsys
| -rw-r--r-- | src/gallium/winsys/g3dvl/radeon/Makefile | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/g3dvl/radeon/radeon_vl.c | 21 |
2 files changed, 6 insertions, 19 deletions
diff --git a/src/gallium/winsys/g3dvl/radeon/Makefile b/src/gallium/winsys/g3dvl/radeon/Makefile index 7bc8bdddf..d02c593f8 100644 --- a/src/gallium/winsys/g3dvl/radeon/Makefile +++ b/src/gallium/winsys/g3dvl/radeon/Makefile @@ -19,7 +19,7 @@ CFLAGS += -g -Wall -Werror=implicit-function-declaration -fPIC \ LDFLAGS += -L${DRMDIR}/lib \ -L${DRIDIR}/lib \ - -L${GALLIUMDIR}/winsys/drm/nouveau/common \ + -L${GALLIUMDIR}/winsys/drm/radeon/core \ -L${GALLIUMDIR}/auxiliary/draw \ -L${GALLIUMDIR}/auxiliary/tgsi \ -L${GALLIUMDIR}/auxiliary/translate \ @@ -27,7 +27,7 @@ LDFLAGS += -L${DRMDIR}/lib \ -L${GALLIUMDIR}/auxiliary/cso_cache \ -L${GALLIUMDIR}/drivers/r300 -LIBS += -ldriclient -ldrm -ldraw -ltgsi -ltranslate -lrtasm -lcso_cache -lm +LIBS += -ldriclient -lradeonwinsys -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 5c53b1a7f..8d7275a1b 100644 --- a/src/gallium/winsys/g3dvl/radeon/radeon_vl.c +++ b/src/gallium/winsys/g3dvl/radeon/radeon_vl.c @@ -92,27 +92,18 @@ static int radeon_vl_context_unbind(struct radeon_vl_context *rvl_ctx) return 0; } -static int radeon_vl_screen_create(dri_screen_t *dri_screen, dri_framebuffer_t *dri_framebuf) +static int radeon_vl_screen_create(Display *display) { struct radeon_vl_screen *rvl_screen; struct radeon_winsys *winsys; struct r300_winsys *r300; - assert(dri_screen); - assert(dri_framebuf); - rvl_screen = CALLOC_STRUCT(radeon_vl_screen); - if (!rvl_screen) - return 1; - - winsys = radeon_pipe_winsys(dri_screen->fd); - r300 = radeon_create_r300_winsys(dri_screen->fd, winsys); + // winsys = radeon_pipe_winsys(display->fd); + // r300 = radeon_create_r300_winsys(display->fd, winsys); r300_create_screen(r300); - rvl_screen->dri_screen = dri_screen; - dri_screen->private = (void*)rvl_screen; - FREE(winsys); return 0; @@ -160,14 +151,10 @@ struct pipe_context* create_pipe_context(Display *display, int screen) assert(display); - driCreateScreen(display, screen, &dri_screen, &dri_framebuf); - driCreateContext(dri_screen, XDefaultVisual(display, screen), &dri_context); - - radeon_vl_screen_create(dri_screen, &dri_framebuf); + radeon_vl_screen_create(display); radeon_vl_context_create(dri_context); rvl_ctx = dri_context->private; - } int destroy_pipe_context(struct pipe_context *pipe) |