OpenCL: use the new library loading architecture for all OpenCL code.

An OpenCL SDK is no longer needed to build OpenCL support.
Note: as a result, the --enable-opencl configure option is removed.

Also, libOpenCL is no longer needed to run the application (it is still necessary to use OpenCL features, of course).



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5886 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 7 insertions, 28 deletions

diff --git a/test/module.defs b/test/module.defs
index e85ba838a..7124895bf 100644
--- a/test/module.defs
+++ b/test/module.defs
@@ -39,15 +39,6 @@ BUILD.out += $(TEST.install.exe)
 
 TEST.GCC.I += $(LIBHB.GCC.I)
 
-ifeq (1,$(FEATURE.opencl))
-ifeq ($(BUILD.system),darwin)
-    TEST.GCC.f += OpenCL
-else
-    TEST.GCC.l += OpenCL
-endif
-    TEST.GCC.D += USE_OPENCL
-endif
-
 ifeq ($(BUILD.system),darwin)
     TEST.GCC.f += IOKit CoreServices AudioToolbox
     TEST.GCC.l += iconv
diff --git a/test/test.c b/test/test.c
index 1b1bb14ef..f3eba7c48 100644
--- a/test/test.c
+++ b/test/test.c
@@ -260,10 +260,7 @@ int main( int argc, char ** argv )
     /* Init libhb */
     h = hb_init( debug, update );
     hb_dvd_set_dvdnav( dvdnav );
-#ifdef USE_OPENCL
-    if( use_opencl )
-        hb_get_opencl_env();
-#endif
+
     /* Show version */
     fprintf( stderr, "%s - %s - %s\n",
              HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
@@ -481,20 +478,12 @@ static void PrintTitleInfo( hb_title_t * title, int feature )
     fprintf( stderr, "  + autocrop: %d/%d/%d/%d\n", title->crop[0],
              title->crop[1], title->crop[2], title->crop[3] );
 
-    fprintf( stderr, "  + support opencl: %s\n",
-#ifdef USE_OPENCL
-             title->opencl_support ? "yes" : "no"
-#else
-             "not built-in"
-#endif
-           );
-    fprintf( stderr, "  + support hwd: %s\n",
+    fprintf(stderr, "  + support opencl: %s\n", title->opencl_support ? "yes" : "no");
 #ifdef USE_HWD
-             title->hwd_support ? "yes" : "no"
+    fprintf(stderr, "  + support hwd: %s\n", title->hwd_support ? "yes" : "no");
 #else
-             "not built-in"
+    fprintf(stderr, "  + support hwd: not built-in\n");
 #endif
-           );
 
     fprintf( stderr, "  + chapters:\n" );
     for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
@@ -2877,11 +2866,10 @@ static int HandleEvents( hb_handle_t * h )
                 job->frame_to_start = start_at_frame;
                 subtitle_scan = 0;
             }
-#ifdef USE_OPENCL 
+
+            /* OpenCL */
             job->use_opencl = use_opencl;
-#else
-            job->use_opencl = 0;
-#endif            
+
             if( subtitle_scan )
             {
                 /*