On Fri, May 26, 2017 at 10:32 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > From: Emil Velikov <emil.veli...@collabora.com> > > Seemingly nothing in r600 depends on it any more. > > This is the second step to unwrapping the amdgpu dependency out of r600. > > Reported-by: udovdh on #dri-devel > Cc: Nicolai Hähnle <nicolai.haeh...@amd.com> > Cc: Marek Olšák <marek.ol...@amd.com> > Signed-off-by: Emil Velikov <emil.veli...@collabora.com> > --- > configure.ac | 3 +-- > src/gallium/drivers/r600/Android.mk | 5 ----- > src/gallium/drivers/r600/Automake.inc | 5 ----- > 3 files changed, 1 insertion(+), 12 deletions(-) > > diff --git a/configure.ac b/configure.ac > index b57be07e24a..6969af1d8d7 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2635,8 +2635,7 @@ 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 \ > - "x$HAVE_GALLIUM_RADEONSI" = xyes -o \ > +AM_CONDITIONAL(HAVE_AMD_DRIVERS, test "x$HAVE_GALLIUM_RADEONSI" = xyes -o \ > "x$HAVE_RADEON_VULKAN" = xyes) > > AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes -o \ > diff --git a/src/gallium/drivers/r600/Android.mk > b/src/gallium/drivers/r600/Android.mk > index 87f433dbaeb..18c5bb63442 100644 > --- a/src/gallium/drivers/r600/Android.mk > +++ b/src/gallium/drivers/r600/Android.mk > @@ -30,11 +30,7 @@ include $(CLEAR_VARS) > > LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES) > > -ifeq ($(MESA_ENABLE_LLVM),true) > -LOCAL_STATIC_LIBRARIES := libmesa_amd_common > -else > LOCAL_C_INCLUDES += $(MESA_TOP)/src/amd/common > -endif
With OpenCL gone, I think you can remove the include too. Rob _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
