On 06/11/13 20:26, Adrian M Negreanu wrote:
> On Sat, Nov 2, 2013 at 9:00 PM, Emil Velikov <emil.l.veli...@gmail.com> wrote:
>> ... and symlink to each target.
>> Make automake's subdir-objects work for r600.
> I think r600 and r300 were removed from the tree[1].
> git am complains about missing dirs
> error: src/gallium/targets/r600/xorg/Makefile.am: does not exist in index
> same error for:
> src/gallium/targets/radeonsi/xorg/Makefile.am:
> src/gallium/targets/r300/xvmc/Makefile.am:
> src/gallium/targets/r300/vdpau/Makefile.am:
> src/gallium/targets/xvmc-softpipe/Makefile.am:
> src/gallium/targets/vdpau-softpipe/Makefile.am:
>
> [1] http://comments.gmane.org/gmane.comp.video.mesa3d.devel/66106
>
Hi Adrian,
There have been some changes, that would result in a few conflicts.
If you're interested in testing the Android changes then you can apply
up to (or even only) patch 10.
Planning to give the series a respin/rebase in a day or so. Meanwhile it
would be great to hear a few more people, esp on the gallium side.
Cheers
Emil
>>
>> Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
>> ---
>> src/gallium/targets/r600/common/drm_target.c | 69
>> ++++++++++++++++++++++++++++
>> src/gallium/targets/r600/dri/Makefile.am | 2 +-
>> src/gallium/targets/r600/dri/drm_target.c | 1 +
>> src/gallium/targets/r600/drm_target.c | 69
>> ----------------------------
>> src/gallium/targets/r600/vdpau/Makefile.am | 2 +-
>> src/gallium/targets/r600/vdpau/drm_target.c | 1 +
>> src/gallium/targets/r600/xorg/Makefile.am | 2 +-
>> src/gallium/targets/r600/xorg/drm_target.c | 1 +
>> src/gallium/targets/r600/xvmc/Makefile.am | 2 +-
>> src/gallium/targets/r600/xvmc/drm_target.c | 1 +
>> 10 files changed, 77 insertions(+), 73 deletions(-)
>> create mode 100644 src/gallium/targets/r600/common/drm_target.c
>> create mode 120000 src/gallium/targets/r600/dri/drm_target.c
>> delete mode 100644 src/gallium/targets/r600/drm_target.c
>> create mode 120000 src/gallium/targets/r600/vdpau/drm_target.c
>> create mode 120000 src/gallium/targets/r600/xorg/drm_target.c
>> create mode 120000 src/gallium/targets/r600/xvmc/drm_target.c
>>
>> diff --git a/src/gallium/targets/r600/common/drm_target.c
>> b/src/gallium/targets/r600/common/drm_target.c
>> new file mode 100644
>> index 0000000..28004ac
>> --- /dev/null
>> +++ b/src/gallium/targets/r600/common/drm_target.c
>> @@ -0,0 +1,69 @@
>> +/**************************************************************************
>> + *
>> + * 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 "radeon/drm/radeon_winsys.h"
>> +#include "r600/r600_public.h"
>> +
>> +static struct pipe_screen *create_screen(int fd)
>> +{
>> + struct radeon_winsys *radeon;
>> +
>> + radeon = radeon_drm_winsys_create(fd);
>> + if (!radeon)
>> + return NULL;
>> +
>> + if (!radeon->screen) {
>> + radeon->screen = r600_screen_create(radeon);
>> + if (!radeon->screen)
>> + return NULL;
>> +
>> + radeon->screen = debug_screen_wrap(radeon->screen);
>> + }
>> +
>> + return radeon->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/r600/dri/Makefile.am
>> b/src/gallium/targets/r600/dri/Makefile.am
>> index c7fca32..b5ea37a 100644
>> --- a/src/gallium/targets/r600/dri/Makefile.am
>> +++ b/src/gallium/targets/r600/dri/Makefile.am
>> @@ -41,7 +41,7 @@ dridir = $(DRI_DRIVER_INSTALL_DIR)
>> dri_LTLIBRARIES = r600_dri.la
>>
>> r600_dri_la_SOURCES = \
>> - ../drm_target.c
>> + drm_target.c
>>
>> r600_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS)
>>
>> diff --git a/src/gallium/targets/r600/dri/drm_target.c
>> b/src/gallium/targets/r600/dri/drm_target.c
>> new file mode 120000
>> index 0000000..6955421
>> --- /dev/null
>> +++ b/src/gallium/targets/r600/dri/drm_target.c
>> @@ -0,0 +1 @@
>> +../common/drm_target.c
>> \ No newline at end of file
>> diff --git a/src/gallium/targets/r600/drm_target.c
>> b/src/gallium/targets/r600/drm_target.c
>> deleted file mode 100644
>> index 28004ac..0000000
>> --- a/src/gallium/targets/r600/drm_target.c
>> +++ /dev/null
>> @@ -1,69 +0,0 @@
>> -/**************************************************************************
>> - *
>> - * 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 "radeon/drm/radeon_winsys.h"
>> -#include "r600/r600_public.h"
>> -
>> -static struct pipe_screen *create_screen(int fd)
>> -{
>> - struct radeon_winsys *radeon;
>> -
>> - radeon = radeon_drm_winsys_create(fd);
>> - if (!radeon)
>> - return NULL;
>> -
>> - if (!radeon->screen) {
>> - radeon->screen = r600_screen_create(radeon);
>> - if (!radeon->screen)
>> - return NULL;
>> -
>> - radeon->screen = debug_screen_wrap(radeon->screen);
>> - }
>> -
>> - return radeon->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/r600/vdpau/Makefile.am
>> b/src/gallium/targets/r600/vdpau/Makefile.am
>> index 043c49c..4f1ff1d 100644
>> --- a/src/gallium/targets/r600/vdpau/Makefile.am
>> +++ b/src/gallium/targets/r600/vdpau/Makefile.am
>> @@ -37,7 +37,7 @@ vdpau_LTLIBRARIES = libvdpau_r600.la
>> EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$'
>>
>> libvdpau_r600_la_SOURCES = \
>> - ../drm_target.c \
>> + drm_target.c \
>> vl_winsys_dri.c
>>
>> libvdpau_r600_la_LDFLAGS = \
>> diff --git a/src/gallium/targets/r600/vdpau/drm_target.c
>> b/src/gallium/targets/r600/vdpau/drm_target.c
>> new file mode 120000
>> index 0000000..6955421
>> --- /dev/null
>> +++ b/src/gallium/targets/r600/vdpau/drm_target.c
>> @@ -0,0 +1 @@
>> +../common/drm_target.c
>> \ No newline at end of file
>> diff --git a/src/gallium/targets/r600/xorg/Makefile.am
>> b/src/gallium/targets/r600/xorg/Makefile.am
>> index c3dee5a..3e51841 100644
>> --- a/src/gallium/targets/r600/xorg/Makefile.am
>> +++ b/src/gallium/targets/r600/xorg/Makefile.am
>> @@ -39,7 +39,7 @@ xorgdir = $(XORG_DRIVER_INSTALL_DIR)
>> xorg_LTLIBRARIES = r600g_drv.la
>>
>> r600g_drv_la_SOURCES = \
>> - ../drm_target.c \
>> + drm_target.c \
>> xorg.c
>>
>> r600g_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
>> diff --git a/src/gallium/targets/r600/xorg/drm_target.c
>> b/src/gallium/targets/r600/xorg/drm_target.c
>> new file mode 120000
>> index 0000000..6955421
>> --- /dev/null
>> +++ b/src/gallium/targets/r600/xorg/drm_target.c
>> @@ -0,0 +1 @@
>> +../common/drm_target.c
>> \ No newline at end of file
>> diff --git a/src/gallium/targets/r600/xvmc/Makefile.am
>> b/src/gallium/targets/r600/xvmc/Makefile.am
>> index 8ca4cee..c4b57af 100644
>> --- a/src/gallium/targets/r600/xvmc/Makefile.am
>> +++ b/src/gallium/targets/r600/xvmc/Makefile.am
>> @@ -35,7 +35,7 @@ xvmcdir = $(XVMC_LIB_INSTALL_DIR)
>> xvmc_LTLIBRARIES = libXvMCr600.la
>>
>> libXvMCr600_la_SOURCES = \
>> - ../drm_target.c \
>> + drm_target.c \
>> vl_winsys_dri.c
>>
>> libXvMCr600_la_LDFLAGS = \
>> diff --git a/src/gallium/targets/r600/xvmc/drm_target.c
>> b/src/gallium/targets/r600/xvmc/drm_target.c
>> new file mode 120000
>> index 0000000..6955421
>> --- /dev/null
>> +++ b/src/gallium/targets/r600/xvmc/drm_target.c
>> @@ -0,0 +1 @@
>> +../common/drm_target.c
>> \ No newline at end of file
>> --
>> 1.8.4.2
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
