diff options
author | Emil Velikov <[email protected]> | 2014-06-12 15:54:15 +0100 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-06-22 23:06:04 +0100 |
commit | dc01ca44a796ab7cc5452913c495ba90ebb648b8 (patch) | |
tree | b6d840952ff80ce302e5f5ac9f070a9e38617498 /src/gallium/targets/xvmc-nouveau | |
parent | 291d70210dd249c663f8c3b92ac9cf47335630bd (diff) |
targets/xvmc-nouveau: convert to static/shared pipe-drivers
Similar to vdpau targets, we're going to convert the individual
target libraries into a single one.
The library can be built with the relevant pipe-drivers
statically linked in, or loaded as shared modules.
Currently we default to static.
Cc: Ilia Mirkin <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Diffstat (limited to 'src/gallium/targets/xvmc-nouveau')
-rw-r--r-- | src/gallium/targets/xvmc-nouveau/Makefile.am | 45 | ||||
-rw-r--r-- | src/gallium/targets/xvmc-nouveau/target.c | 18 |
2 files changed, 0 insertions, 63 deletions
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am deleted file mode 100644 index e1061cd5eda..00000000000 --- a/src/gallium/targets/xvmc-nouveau/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright © 2012 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CPPFLAGS = \ - -DSPLIT_TARGETS=1 -AM_CFLAGS = \ - $(GALLIUM_VIDEO_CFLAGS) - -xvmcdir = $(XVMC_LIB_INSTALL_DIR) -xvmc_LTLIBRARIES = libXvMCnouveau.la - -nodist_EXTRA_libXvMCnouveau_la_SOURCES = dummy.cpp -libXvMCnouveau_la_SOURCES = \ - target.c \ - $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c - -libXvMCnouveau_la_LDFLAGS = \ - $(GALLIUM_XVMC_LINKER_FLAGS) - -libXvMCnouveau_la_LIBADD = \ - $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ - $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ - $(GALLIUM_XVMC_LIB_DEPS) \ - $(NOUVEAU_LIBS) diff --git a/src/gallium/targets/xvmc-nouveau/target.c b/src/gallium/targets/xvmc-nouveau/target.c deleted file mode 100644 index d580b104421..00000000000 --- a/src/gallium/targets/xvmc-nouveau/target.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" -#include "nouveau/drm/nouveau_drm_public.h" - -static struct pipe_screen *create_screen(int fd) -{ - struct pipe_screen *screen; - - screen = nouveau_drm_screen_create(fd); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen, NULL) |