diff options
Diffstat (limited to 'src/gallium/winsys/g3dvl')
| -rw-r--r-- | src/gallium/winsys/g3dvl/dri/dri_winsys.c | 12 | ||||
| -rw-r--r-- | src/gallium/winsys/g3dvl/drm/Makefile.template | 10 | ||||
| -rw-r--r-- | src/gallium/winsys/g3dvl/drm/nouveau/Makefile | 3 |
3 files changed, 8 insertions, 17 deletions
diff --git a/src/gallium/winsys/g3dvl/dri/dri_winsys.c b/src/gallium/winsys/g3dvl/dri/dri_winsys.c index da54c0976f6..c8ff8fae169 100644 --- a/src/gallium/winsys/g3dvl/dri/dri_winsys.c +++ b/src/gallium/winsys/g3dvl/dri/dri_winsys.c @@ -358,18 +358,18 @@ vl_video_create(struct vl_screen *vscreen, /* XXX: Is default visual correct/sufficient here? */ driCreateContext(vl_dri_scrn->dri_screen, vl_dri_scrn->visual, &vl_dri_ctx->dri_context); - if (!vl_dri_scrn->api->create_video_context) { + if (!vscreen->pscreen->video_context_create) { debug_printf("[G3DVL] No video support found on %s/%s.\n", - vl_dri_scrn->base.pscreen->get_vendor(vl_dri_scrn->base.pscreen), - vl_dri_scrn->base.pscreen->get_name(vl_dri_scrn->base.pscreen)); + vscreen->pscreen->get_vendor(vscreen->pscreen), + vscreen->pscreen->get_name(vscreen->pscreen)); FREE(vl_dri_ctx); return NULL; } - vl_dri_ctx->base.vpipe = vl_dri_scrn->api->create_video_context(vl_dri_scrn->api, - vscreen->pscreen, + vl_dri_ctx->base.vpipe = vscreen->pscreen->video_context_create(vscreen->pscreen, profile, chroma_format, - width, height); + width, height, + vl_dri_ctx->dri_context); if (!vl_dri_ctx->base.vpipe) { FREE(vl_dri_ctx); diff --git a/src/gallium/winsys/g3dvl/drm/Makefile.template b/src/gallium/winsys/g3dvl/drm/Makefile.template index a33d95677c5..2b79deef4bc 100644 --- a/src/gallium/winsys/g3dvl/drm/Makefile.template +++ b/src/gallium/winsys/g3dvl/drm/Makefile.template @@ -15,7 +15,7 @@ INCLUDES = $(DRIVER_INCLUDES) \ DEFINES += $(DRIVER_DEFINES) \ -DGALLIUM_SOFTPIPE \ - -DGALLIUM_TRACE + -DGALLIUM_TRACE # XXX: Hack, if we include libxvmctracker.a in LIBS none of the symbols are # pulled in by the linker because xsp_winsys.c doesn't refer to them @@ -23,13 +23,7 @@ OBJECTS = $(C_SOURCES:.c=.o) $(TOP)/src/gallium/state_trackers/xorg/xvmc/*.o LIBS = $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ $(PIPE_DRIVERS) \ - $(TOP)/src/gallium/auxiliary/vl/libvl.a \ - $(TOP)/src/gallium/auxiliary/draw/libdraw.a \ - $(TOP)/src/gallium/auxiliary/tgsi/libtgsi.a \ - $(TOP)/src/gallium/auxiliary/translate/libtranslate.a \ - $(TOP)/src/gallium/auxiliary/cso_cache/libcso_cache.a \ - $(TOP)/src/gallium/auxiliary/rtasm/librtasm.a \ - $(TOP)/src/gallium/auxiliary/util/libutil.a + $(TOP)/src/gallium/auxiliary/libgallium.a .c.o: $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@ diff --git a/src/gallium/winsys/g3dvl/drm/nouveau/Makefile b/src/gallium/winsys/g3dvl/drm/nouveau/Makefile index fe41ac9269e..5c55186f672 100644 --- a/src/gallium/winsys/g3dvl/drm/nouveau/Makefile +++ b/src/gallium/winsys/g3dvl/drm/nouveau/Makefile @@ -12,9 +12,6 @@ DRIVER_DEFINES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-other) PIPE_DRIVERS = \ $(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \ - $(TOP)/src/gallium/drivers/nv04/libnv04.a \ - $(TOP)/src/gallium/drivers/nv10/libnv10.a \ - $(TOP)/src/gallium/drivers/nv20/libnv20.a \ $(TOP)/src/gallium/drivers/nv30/libnv30.a \ $(TOP)/src/gallium/drivers/nv40/libnv40.a \ $(TOP)/src/gallium/drivers/nv50/libnv50.a \ |