[Mesa-dev] [PATCH 1/1] automake: r600 should only depend on libamd_common if opencl is enabled

[Jan Vesely]

On Fri, 2017-06-02 at 12:19 +0100, Emil Velikov wrote:
> On 1 June 2017 at 21:28, Jan Vesely <jan.vesely at rutgers.edu> wrote:
> > Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
> > ---
> > Hi guys,
> > 
> > this is the first step towards dropping libamd_common dependency.
> > It's based on Emil's patches 3/5 and 4/5.
> > Enabling opencl still falls back to the old way of requiring libamd_common.
> > I'll try to address that in the next step (no time estimate, feel
> > free to beat me to it). I think we can drop part of those functions
> > rather than just copying them.
> > 
> 
> AFAICT one still need the rest of my series, correct?

kind of, 1/5 is mostly unrelated. 2,3/5 should be replaced by this one.
4/5 is needed, and 5/5 seems to be not applicable since ac_gpu_info.c
still needs the header.

> 
> > Emil, I didn't find anything in android build that enabled opencl,
> > so I dropped it entirely.
> > 
> 
> Good point. Please flesh that in a separate patch though.... IIRC
> there might be a bit more related cleanups that need squashing.
> 
> > regards,
> > Jan
> > 
> >  configure.ac                                | 3 ++-
> >  src/gallium/drivers/r600/Android.mk         | 5 -----
> >  src/gallium/drivers/r600/Automake.inc       | 2 +-
> >  src/gallium/targets/pipe-loader/Makefile.am | 2 +-
> >  4 files changed, 4 insertions(+), 8 deletions(-)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 5caf316..e0996a0 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -2631,7 +2631,8 @@ AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
> >  AM_CONDITIONAL(HAVE_RADEON_VULKAN, test "x$HAVE_RADEON_VULKAN" = xyes)
> >  AM_CONDITIONAL(HAVE_INTEL_VULKAN, test "x$HAVE_INTEL_VULKAN" = xyes)
> > 
> > -AM_CONDITIONAL(HAVE_AMD_DRIVERS, test "x$HAVE_GALLIUM_R600" = xyes -o \
> > +AM_CONDITIONAL(HAVE_AMD_DRIVERS, test \( "x$HAVE_GALLIUM_R600" = xyes -a \
> > +                                      "x$enable_opencl" = xyes \) -o \
> 
> Please add a beefy XXX/TODO/FIXME comment and reference the
> s/HAVE_GALLIUM_LLVM/HAVE_AMD_DRIVERS/ changes.
> 
> -Emil

-- 
Jan Vesely <jan.vesely at rutgers.edu>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170602/14aa4c3a/attachment.sig>