<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Mon, Jun 5, 2017 at 5:31 PM, Jan Vesely <<a href="mailto:jan.vesely@rutgers.edu" target="_blank">jan.vesely@rutgers.edu</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Mon, 2017-06-05 at 15:31 -0500, Aaron Watry wrote: > From: Jan Vesely <<a href="mailto:jan.vesely@rutgers.edu">jan.vesely@rutgers.edu</a>> > > Signed-off-by: Jan Vesely <<a href="mailto:jan.vesely@rutgers.edu">jan.vesely@rutgers.edu</a>> > Reviewed-by: Aaron Watry <<a href="mailto:awatry@gmail.com">awatry@gmail.com</a>> I think Emil preferred v2, with comments and split android changes. </blockquote><div>Fair enough. I missed/forgot about that v2. I'll retest with that. </div><div>--Aaron </div><div> </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Jan <div><div class="h5"> > --- > <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 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/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> > index 5caf316089..e0996a0004 100644 > --- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> > +++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> > @@ -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 \ > "x$HAVE_GALLIUM_RADEONSI" = xyes -o \ > "x$HAVE_RADEON_VULKAN" = xyes) > > diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk > index 87f433dbae..18c5bb6344 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 > > LOCAL_SHARED_LIBRARIES := libdrm_radeon > LOCAL_MODULE := libmesa_pipe_r600 > @@ -45,7 +41,6 @@ include $(BUILD_STATIC_LIBRARY) > ifneq ($(HAVE_GALLIUM_R600),) > $(eval GALLIUM_LIBS += \ > $(LOCAL_MODULE) \ > - $(LOCAL_STATIC_LIBRARIES) \ > libmesa_winsys_radeon) > $(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) > endif > diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc > index fa457359de..c96fe743ce 100644 > --- a/src/gallium/drivers/r600/Automake.inc > +++ b/src/gallium/drivers/r600/Automake.inc > @@ -13,7 +13,7 @@ TARGET_RADEON_WINSYS = \ > TARGET_RADEON_COMMON = \ > $(top_builddir)/src/gallium/drivers/radeon/<a href="http://libradeon.la" rel="noreferrer" target="_blank">libradeon.la</a> > > -if HAVE_GALLIUM_LLVM > +if HAVE_AMD_DRIVERS > TARGET_RADEON_COMMON += \ > $(top_builddir)/src/amd/common/<a href="http://libamd_common.la" rel="noreferrer" target="_blank">libamd_common.la</a> > endif > diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am > index 5f629a2982..c99153310b 100644 > --- a/src/gallium/targets/pipe-loader/Makefile.am > +++ b/src/gallium/targets/pipe-loader/Makefile.am > @@ -131,7 +131,7 @@ pipe_r600_la_LIBADD = \ > $(LIBDRM_LIBS) \ > $(RADEON_LIBS) > > -if HAVE_GALLIUM_LLVM > +if HAVE_AMD_DRIVERS > pipe_r600_la_LIBADD += \ > $(top_builddir)/src/amd/common/<a href="http://libamd_common.la" rel="noreferrer" target="_blank">libamd_common.la</a> > endif -- </div></div>Jan Vesely <<a href="mailto:jan.vesely@rutgers.edu">jan.vesely@rutgers.edu</a>></blockquote></div> </div></div>