[gegl] gegl-init: Override config value when OpenCL is requested via env var.



commit c4aab2e3bae6187ebcc61e568de43b4d97deca14
Author: Jan Vesely <jano vesely gmail com>
Date:   Sun Mar 31 16:29:12 2019 -0400

    gegl-init: Override config value when OpenCL is requested via env var.
    
    Signed-off-by: Jan Vesely <jano vesely gmail com>

 gegl/gegl-init.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/gegl/gegl-init.c b/gegl/gegl-init.c
index 9509281cd..40da99d99 100644
--- a/gegl/gegl-init.c
+++ b/gegl/gegl-init.c
@@ -339,16 +339,19 @@ gegl_config_parse_env (GeglConfig *config)
       const char *opencl_env = g_getenv ("GEGL_USE_OPENCL");
 
       if (g_ascii_strcasecmp (opencl_env, "yes") == 0)
-        ;
+        g_object_set (config, "use-opencl", TRUE, NULL);
       else if (g_ascii_strcasecmp (opencl_env, "no") == 0)
         gegl_cl_hard_disable ();
-      else if (g_ascii_strcasecmp (opencl_env, "cpu") == 0)
+      else if (g_ascii_strcasecmp (opencl_env, "cpu") == 0) {
         gegl_cl_set_default_device_type (CL_DEVICE_TYPE_CPU);
-      else if (g_ascii_strcasecmp (opencl_env, "gpu") == 0)
+        g_object_set (config, "use-opencl", TRUE, NULL);
+      } else if (g_ascii_strcasecmp (opencl_env, "gpu") == 0) {
         gegl_cl_set_default_device_type (CL_DEVICE_TYPE_GPU);
-      else if (g_ascii_strcasecmp (opencl_env, "accelerator") == 0)
+        g_object_set (config, "use-opencl", TRUE, NULL);
+      } else if (g_ascii_strcasecmp (opencl_env, "accelerator") == 0) {
         gegl_cl_set_default_device_type (CL_DEVICE_TYPE_ACCELERATOR);
-      else
+        g_object_set (config, "use-opencl", TRUE, NULL);
+      } else
         g_warning ("Unknown value for GEGL_USE_OPENCL: %s", opencl_env);
     }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]