fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 11:20:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build/radeonsi: group all targets in common subdir

Browse source 
Allows us to share more code between different targets.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Christian König 2013-09-25 12:28:09 +02:00
parent 015853b568
commit f6e2aa0e12
10 changed files with 78 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -1793,7 +1793,7 @@ if test "x$with_gallium_drivers" != x; then
gallium_require_drm_loader
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi"
radeon_llvm_check
gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" "" "vdpau-radeonsi" ""
gallium_check_st "radeon/drm" "radeonsi/dri" "radeonsi/xorg" "" "" "radeonsi/vdpau" ""
;;
xnouveau)
HAVE_GALLIUM_NOUVEAU=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-radeonsi/Makefile
src/gallium/targets/dri-swrast/Makefile
src/gallium/targets/dri-vmwgfx/Makefile
src/gallium/targets/egl-static/Makefile
@ -2041,6 +2040,9 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/osmesa/Makefile
src/gallium/targets/osmesa/osmesa.pc
src/gallium/targets/pipe-loader/Makefile
src/gallium/targets/radeonsi/dri/Makefile
src/gallium/targets/radeonsi/vdpau/Makefile
src/gallium/targets/radeonsi/xorg/Makefile
src/gallium/targets/r300/dri/Makefile
src/gallium/targets/r300/vdpau/Makefile
src/gallium/targets/r300/xvmc/Makefile
@ -2050,13 +2052,11 @@ AC_CONFIG_FILES([Makefile
src/gallium/targets/r600/xvmc/Makefile
src/gallium/targets/libgl-xlib/Makefile
src/gallium/targets/vdpau-nouveau/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-radeonsi/Makefile
src/gallium/targets/xvmc-nouveau/Makefile
src/gallium/targets/xvmc-softpipe/Makefile
src/gallium/tests/trivial/Makefile

6
src/gallium/targets/Makefile.am
View file

@ -104,15 +104,15 @@ endif
if HAVE_GALLIUM_RADEONSI
if HAVE_DRI
SUBDIRS += dri-radeonsi
SUBDIRS += radeonsi/dri
endif
if HAVE_ST_XORG
SUBDIRS += xorg-radeonsi
SUBDIRS += radeonsi/xorg
endif
if HAVE_ST_VDPAU
SUBDIRS += vdpau-radeonsi
SUBDIRS += radeonsi/vdpau
endif
endif

40
src/gallium/targets/dri-radeonsi/target.c
View file

@ -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 "radeonsi/radeonsi_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 = radeonsi_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("radeonsi", "radeon", create_screen, drm_configuration)

2
src/gallium/targets/dri-radeonsi/Makefile.am → src/gallium/targets/radeonsi/dri/Makefile.am
View file

@ -41,7 +41,7 @@ dri_LTLIBRARIES = radeonsi_dri.la
nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp
radeonsi_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

67
src/gallium/targets/radeonsi/drm_target.c Normal file
View file

@ -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 "radeonsi/radeonsi_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 = radeonsi_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("radeonsi", "radeon", create_screen, drm_configuration)

2
src/gallium/targets/vdpau-radeonsi/Makefile.am → src/gallium/targets/radeonsi/vdpau/Makefile.am
View file

@ -35,7 +35,7 @@ vdpau_LTLIBRARIES = libvdpau_radeonsi.la
nodist_EXTRA_libvdpau_radeonsi_la_SOURCES = dummy.cpp
libvdpau_radeonsi_la_SOURCES = \
target.c \
../drm_target.c \
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
libvdpau_radeonsi_la_LDFLAGS = \

2
src/gallium/targets/xorg-radeonsi/Makefile.am → src/gallium/targets/radeonsi/xorg/Makefile.am
View file

@ -39,7 +39,7 @@ xorg_LTLIBRARIES = radeonsi_drv.la
nodist_EXTRA_radeonsi_drv_la_SOURCES = dummy.cpp
radeonsi_drv_la_SOURCES = \
target.c \
../drm_target.c \
xorg.c
radeonsi_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined

2
src/gallium/targets/xorg-radeonsi/xorg.c → src/gallium/targets/radeonsi/xorg/xorg.c
View file

@ -29,7 +29,7 @@
*
*/
#include "../../state_trackers/xorg/xorg_winsys.h"
#include "../../../state_trackers/xorg/xorg_winsys.h"
static void radeonsi_xorg_identify(int flags);
static Bool radeonsi_xorg_pci_probe(DriverPtr driver,

24
src/gallium/targets/vdpau-radeonsi/target.c
View file

@ -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 "radeonsi/radeonsi_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 = radeonsi_screen_create(radeon);
if (!screen)
return NULL;
screen = debug_screen_wrap(screen);
return screen;
}
DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, NULL)

26
src/gallium/targets/xorg-radeonsi/target.c
View file

@ -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 "radeonsi/radeonsi_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 = radeonsi_screen_create(sws);
if (!screen)
return NULL;
screen = debug_screen_wrap(screen);
return screen;
}
DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, NULL)