Remove opencl-sdk configure option, and build time opencl conditionals.

We now load OpenCL library dynmically at run-time as needed. So there
is no build time dependency on any OpenCL implementations.

Change-Id: I214399060398a7c5e37b9a254147ccc2834e7866

Repository.mk

@@ -155,9 +155,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
 	sc \
 	scd \
 	scfilt \
+	scopencl \
 	scui \
 	solver \
-	$(if $(ENABLE_OPENCL),scopencl) \
 	$(if $(DISABLE_SCRIPTING),,vbaobj) \
 	$(if $(ENABLE_TELEPATHY),tubes) \
 ))

RepositoryExternal.mk

@@ -29,23 +29,6 @@
 
 # External headers
 
-ifeq ($(ENABLE_OPENCL),TRUE)
-
-define gb_LinkTarget__use_opencl
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-    $(OPENCL_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(OPENCL_LIBS))
-
-endef
-
-else # ENABLE_OPENCL != TRUE
-
-gb_LinkTarget__use_opencl :=
-
-endif
-
 ifeq ($(SYSTEM_MARIADB),YES)
 
 define gb_LinkTarget__use_mariadb

config_host.mk.in

@@ -147,7 +147,6 @@ export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@
 export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL=@ENABLE_OPENGL@
-export ENABLE_OPENCL=@ENABLE_OPENCL@
 export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
@@ -404,8 +403,6 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@
 export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_VENDOR=@OOO_VENDOR@
-export OPENCL_CFLAGS=$(gb_SPACE)@OPENCL_CFLAGS@
-export OPENCL_LIBS=$(gb_SPACE)@OPENCL_LIBS@
 export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
 export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
 export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@

config_host/config_features.h.in

@@ -67,13 +67,6 @@
 
 #define HAVE_FEATURE_MULTIUSER_ENVIRONMENT 0
 
-/*
- * Whether we have the OpenCL headers and should compile in any
- * support for that abstraction.
- */
-
-#define HAVE_FEATURE_OPENCL 0
-
 /* 
  * Whether the OS has Avahi support, 
  * This library is used for zeroconf service publication on the local network

configure.ac

@@ -1810,16 +1810,6 @@ AC_ARG_WITH(windows-sdk,
     ],
 ,)
 
-AC_ARG_WITH(opencl-sdk,
-    AS_HELP_STRING([--with-opencl-sdk],
-        [If you have the AMD HSA / opencl SDK installed (cf.
-         http://developer.amd.com/tools-and-sdks/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/downloads/ )
-         Pass the absolute path to where that SDK is unpacked.])
-    [
-                          Usage:     --with-opencl-sdk=/opt/AMDAPP
-    ],
-,)
-
 AC_ARG_WITH(lang,
     AS_HELP_STRING([--with-lang],
         [Use this option to build LibreOffice with additional language support.
@@ -10232,44 +10222,6 @@ fi
 AC_SUBST(SYSTEM_MESA_HEADERS)
 AC_SUBST(ENABLE_OPENGL)
 
-dnl =================================================
-dnl Check whether the OpenCL libraries are available
-dnl =================================================
-
-OPENCL_LIBS=
-OPENCL_CFLAGS=
-ENABLE_OPENCL=
-AC_MSG_CHECKING([OpenCL])
-if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin -a "$with_macosx_sdk" != 10.6; then
-    # OS X SDK > 10.6
-    AC_MSG_RESULT([yes, always on OS X > 10.6])
-    ENABLE_OPENCL=TRUE
-    OPENCL_CFLAGS=
-    OPENCL_LIBS="-framework OpenCL"
-    AC_DEFINE(HAVE_FEATURE_OPENCL)
-elif test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then
-    AC_MSG_RESULT([no])
-else
-    if test -d "$with_opencl_sdk/include"; then
-        ENABLE_OPENCL=TRUE
-        if test "$_os" = "WINNT"; then
-            PathFormat "$with_opencl_sdk"
-            OPENCL_CFLAGS="-I$formatted_path/include"
-            OPENCL_LIBS="-LIBPATH:$formatted_path/lib/x86 OpenCL.lib"
-        else
-            OPENCL_CFLAGS="-I$with_opencl_sdk/include"
-            OPENCL_LIBS="-L$with_opencl_sdk/lib/x86 -lOpenCL"
-        fi
-        AC_MSG_RESULT([found at path $with_opencl_sdk])
-        AC_DEFINE(HAVE_FEATURE_OPENCL)
-    else
-        AC_MSG_ERROR([no headers found found at $with_opencl_sdk/include ])
-    fi
-fi
-AC_SUBST(OPENCL_CFLAGS)
-AC_SUBST(OPENCL_LIBS)
-AC_SUBST(ENABLE_OPENCL)
-
 # presenter minimizer extension?
 AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
 if test "x$enable_ext_presenter_minimizer" != "xno" -a "x$enable_extension_integration" != "xno"; then

sc/CppunitTest_sc_ucalc.mk

@@ -26,9 +26,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc, \
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes))
 endif
-ifeq ($(ENABLE_OPENCL),TRUE)
-$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,opencl))
-endif
 
 $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
 	boost_headers \

sc/Module_sc.mk

@@ -15,16 +15,11 @@ $(eval $(call gb_Module_add_targets,sc,\
 	Library_sc \
 	Library_scd \
 	Library_scfilt \
+	Library_scopencl \
 	Library_scui \
 	UIConfig_scalc \
 ))
 
-ifeq ($(ENABLE_OPENCL),TRUE)
-$(eval $(call gb_Module_add_targets,sc,\
-	Library_scopencl \
-))
-endif
-
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,sc,\
 	Library_scqahelper \

sc/source/core/tool/formulagroup.cxx

@@ -358,7 +358,6 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic()
 
     if ( !msInstance )
     {
-#if HAVE_FEATURE_OPENCL
         if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
         {
 #ifdef DISABLE_DYNLOADING
@@ -383,7 +382,7 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic()
                 msInstance = new sc::FormulaGroupInterpreterOpenCLMissing();
 #endif
         }
-#endif
+
         if ( !msInstance ) // software fallback
         {
             fprintf(stderr, "Create S/W interp\n");

sc/source/ui/optdlg/calcoptionsdlg.cxx

@@ -196,9 +196,7 @@ void ScCalcOptionsDialog::FillOptionsList()
     }
 
     pModel->Insert(createBoolItem(maCaptionEmptyStringAsZero,maConfig.mbEmptyStringAsZero));
-#if HAVE_FEATURE_OPENCL
     pModel->Insert(createBoolItem(maCaptionOpenCLEnabled,maConfig.mbOpenCLEnabled));
-#endif
 
     mpLbSettings->SetUpdateMode(true);
 }