diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/gallium/targets/Makefile.am | 8 | ||||
| -rw-r--r-- | src/gallium/targets/dri-r600/target.c | 40 | ||||
| -rw-r--r-- | src/gallium/targets/r600/dri/Makefile.am (renamed from src/gallium/targets/dri-r600/Makefile.am) | 2 | ||||
| -rw-r--r-- | src/gallium/targets/r600/drm_target.c | 67 | ||||
| -rw-r--r-- | src/gallium/targets/r600/vdpau/Makefile.am (renamed from src/gallium/targets/vdpau-r600/Makefile.am) | 2 | ||||
| -rw-r--r-- | src/gallium/targets/r600/xorg/Makefile.am (renamed from src/gallium/targets/xorg-r600/Makefile.am) | 2 | ||||
| -rw-r--r-- | src/gallium/targets/r600/xorg/xorg.c (renamed from src/gallium/targets/xorg-r600/xorg.c) | 2 | ||||
| -rw-r--r-- | src/gallium/targets/r600/xvmc/Makefile.am (renamed from src/gallium/targets/xvmc-r600/Makefile.am) | 2 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau-r600/target.c | 24 | ||||
| -rw-r--r-- | src/gallium/targets/xorg-r600/target.c | 26 | ||||
| -rw-r--r-- | src/gallium/targets/xvmc-r600/target.c | 24 |
12 files changed, 81 insertions, 128 deletions
diff --git a/configure.ac b/configure.ac index b1cb89e3a8d..ff8f5436ed0 100644 --- a/configure.ac +++ b/configure.ac @@ -1785,7 +1785,7 @@ if test "x$with_gallium_drivers" != x; then if test "x$enable_opencl" = xyes; then LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser" fi - gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" + gallium_check_st "radeon/drm" "r600/dri" "r600/xorg" "" "r600/xvmc" "r600/vdpau" ;; xradeonsi) HAVE_GALLIUM_RADEONSI=yes @@ -2032,7 +2032,6 @@ AC_CONFIG_FILES([Makefile src/gallium/targets/dri-i915/Makefile src/gallium/targets/dri-ilo/Makefile src/gallium/targets/dri-nouveau/Makefile - src/gallium/targets/dri-r600/Makefile src/gallium/targets/dri-radeonsi/Makefile src/gallium/targets/dri-swrast/Makefile src/gallium/targets/dri-vmwgfx/Makefile @@ -2045,19 +2044,20 @@ AC_CONFIG_FILES([Makefile src/gallium/targets/r300/dri/Makefile src/gallium/targets/r300/vdpau/Makefile src/gallium/targets/r300/xvmc/Makefile + src/gallium/targets/r600/dri/Makefile + src/gallium/targets/r600/vdpau/Makefile + src/gallium/targets/r600/xorg/Makefile + src/gallium/targets/r600/xvmc/Makefile src/gallium/targets/libgl-xlib/Makefile src/gallium/targets/vdpau-nouveau/Makefile - src/gallium/targets/vdpau-r600/Makefile src/gallium/targets/vdpau-radeonsi/Makefile src/gallium/targets/vdpau-softpipe/Makefile src/gallium/targets/xa-vmwgfx/Makefile src/gallium/targets/xa-vmwgfx/xatracker.pc src/gallium/targets/xorg-i915/Makefile src/gallium/targets/xorg-nouveau/Makefile - src/gallium/targets/xorg-r600/Makefile src/gallium/targets/xorg-radeonsi/Makefile src/gallium/targets/xvmc-nouveau/Makefile - src/gallium/targets/xvmc-r600/Makefile src/gallium/targets/xvmc-softpipe/Makefile src/gallium/tests/trivial/Makefile src/gallium/tests/unit/Makefile diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index 997ee8e3654..c5126c03bf6 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -86,19 +86,19 @@ endif if HAVE_GALLIUM_R600 if HAVE_DRI -SUBDIRS += dri-r600 +SUBDIRS += r600/dri endif if HAVE_ST_XORG -SUBDIRS += xorg-r600 +SUBDIRS += r600/xorg endif if HAVE_ST_XVMC -SUBDIRS += xvmc-r600 +SUBDIRS += r600/xvmc endif if HAVE_ST_VDPAU -SUBDIRS += vdpau-r600 +SUBDIRS += r600/vdpau endif endif diff --git a/src/gallium/targets/dri-r600/target.c b/src/gallium/targets/dri-r600/target.c deleted file mode 100644 index 9bff6f2058a..00000000000 --- a/src/gallium/targets/dri-r600/target.c +++ /dev/null @@ -1,40 +0,0 @@ -#include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" -#include "radeon/drm/radeon_drm_public.h" -#include "r600/r600_public.h" - -static struct pipe_screen *create_screen(int fd) -{ - struct radeon_winsys *radeon; - struct pipe_screen *screen; - - radeon = radeon_drm_winsys_create(fd); - if (!radeon) - return NULL; - - screen = r600_screen_create(radeon); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -static const struct drm_conf_ret throttle_ret = { - .type = DRM_CONF_INT, - .val.val_int = 2, -}; - -static const struct drm_conf_ret *drm_configuration(enum drm_conf conf) -{ - switch (conf) { - case DRM_CONF_THROTTLE: - return &throttle_ret; - default: - break; - } - return NULL; -} - -DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen, drm_configuration) diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am index 2b3524baa6f..423ad0ea60e 100644 --- a/src/gallium/targets/dri-r600/Makefile.am +++ b/src/gallium/targets/r600/dri/Makefile.am @@ -40,7 +40,7 @@ dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = r600_dri.la r600_dri_la_SOURCES = \ - target.c \ + ../drm_target.c \ $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \ $(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \ $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c diff --git a/src/gallium/targets/r600/drm_target.c b/src/gallium/targets/r600/drm_target.c new file mode 100644 index 00000000000..c93c4dbe529 --- /dev/null +++ b/src/gallium/targets/r600/drm_target.c @@ -0,0 +1,67 @@ +/************************************************************************** + * + * Copyright 2013 Advanced Micro Devices, Inc. + * All Rights Reserved. + * + * 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, sub license, 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 NON-INFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 "state_tracker/drm_driver.h" +#include "target-helpers/inline_debug_helper.h" +#include "radeon/drm/radeon_drm_public.h" +#include "r600/r600_public.h" + +static struct pipe_screen *create_screen(int fd) +{ + struct radeon_winsys *radeon; + struct pipe_screen *screen; + + radeon = radeon_drm_winsys_create(fd); + if (!radeon) + return NULL; + + screen = r600_screen_create(radeon); + if (!screen) + return NULL; + + screen = debug_screen_wrap(screen); + + return screen; +} + +static const struct drm_conf_ret throttle_ret = { + .type = DRM_CONF_INT, + .val.val_int = 2, +}; + +static const struct drm_conf_ret *drm_configuration(enum drm_conf conf) +{ + switch (conf) { + case DRM_CONF_THROTTLE: + return &throttle_ret; + default: + break; + } + return NULL; +} + +DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen, drm_configuration) diff --git a/src/gallium/targets/vdpau-r600/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am index f6b82de0cf4..e45fd93c474 100644 --- a/src/gallium/targets/vdpau-r600/Makefile.am +++ b/src/gallium/targets/r600/vdpau/Makefile.am @@ -34,7 +34,7 @@ vdpaudir = $(VDPAU_LIB_INSTALL_DIR) vdpau_LTLIBRARIES = libvdpau_r600.la libvdpau_r600_la_SOURCES = \ - target.c \ + ../drm_target.c \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libvdpau_r600_la_LDFLAGS = \ diff --git a/src/gallium/targets/xorg-r600/Makefile.am b/src/gallium/targets/r600/xorg/Makefile.am index 1a21655b681..90bcbd53905 100644 --- a/src/gallium/targets/xorg-r600/Makefile.am +++ b/src/gallium/targets/r600/xorg/Makefile.am @@ -38,7 +38,7 @@ xorgdir = $(XORG_DRIVER_INSTALL_DIR) xorg_LTLIBRARIES = r600g_drv.la r600g_drv_la_SOURCES = \ - target.c \ + ../drm_target.c \ xorg.c r600g_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined diff --git a/src/gallium/targets/xorg-r600/xorg.c b/src/gallium/targets/r600/xorg/xorg.c index 120cf6da6fd..83610fd3fd2 100644 --- a/src/gallium/targets/xorg-r600/xorg.c +++ b/src/gallium/targets/r600/xorg/xorg.c @@ -29,7 +29,7 @@ * */ -#include "../../state_trackers/xorg/xorg_winsys.h" +#include "../../../state_trackers/xorg/xorg_winsys.h" static void r600_xorg_identify(int flags); static Bool r600_xorg_pci_probe(DriverPtr driver, diff --git a/src/gallium/targets/xvmc-r600/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am index b337c7ea6e3..8443e177db4 100644 --- a/src/gallium/targets/xvmc-r600/Makefile.am +++ b/src/gallium/targets/r600/xvmc/Makefile.am @@ -34,7 +34,7 @@ xvmcdir = $(XVMC_LIB_INSTALL_DIR) xvmc_LTLIBRARIES = libXvMCr600.la libXvMCr600_la_SOURCES = \ - target.c \ + ../drm_target.c \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libXvMCr600_la_LDFLAGS = \ diff --git a/src/gallium/targets/vdpau-r600/target.c b/src/gallium/targets/vdpau-r600/target.c deleted file mode 100644 index 3b7795b3507..00000000000 --- a/src/gallium/targets/vdpau-r600/target.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" -#include "radeon/drm/radeon_drm_public.h" -#include "r600/r600_public.h" - -static struct pipe_screen *create_screen(int fd) -{ - struct radeon_winsys *radeon; - struct pipe_screen *screen; - - radeon = radeon_drm_winsys_create(fd); - if (!radeon) - return NULL; - - screen = r600_screen_create(radeon); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen, NULL) diff --git a/src/gallium/targets/xorg-r600/target.c b/src/gallium/targets/xorg-r600/target.c deleted file mode 100644 index 75785da6e9b..00000000000 --- a/src/gallium/targets/xorg-r600/target.c +++ /dev/null @@ -1,26 +0,0 @@ - -#include "target-helpers/inline_debug_helper.h" -#include "state_tracker/drm_driver.h" -#include "radeon/drm/radeon_drm_public.h" -#include "r600/r600_public.h" - -static struct pipe_screen * -create_screen(int fd) -{ - struct radeon_winsys *sws; - struct pipe_screen *screen; - - sws = radeon_drm_winsys_create(fd); - if (!sws) - return NULL; - - screen = r600_screen_create(sws); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen, NULL) diff --git a/src/gallium/targets/xvmc-r600/target.c b/src/gallium/targets/xvmc-r600/target.c deleted file mode 100644 index 3b7795b3507..00000000000 --- a/src/gallium/targets/xvmc-r600/target.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" -#include "radeon/drm/radeon_drm_public.h" -#include "r600/r600_public.h" - -static struct pipe_screen *create_screen(int fd) -{ - struct radeon_winsys *radeon; - struct pipe_screen *screen; - - radeon = radeon_drm_winsys_create(fd); - if (!radeon) - return NULL; - - screen = r600_screen_create(radeon); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen, NULL) |