[Libreoffice-commits] core.git: 2 commits - opencl/inc opencl/source

[Tor Lillqvist]

 opencl/inc/opencl_device_selection.h |    5 +++++
 opencl/source/openclwrapper.cxx      |    6 ++++++
 2 files changed, 11 insertions(+)

New commits:
commit 4e3bcddeb561309f94973115e05d5ac63b178e0d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jun 27 18:14:47 2016 +0300

    Add some SAL_INFO output
    
    Change-Id: I8b47034f5b1fed465415399de89979102df8d9a7

diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index ab65091..ace3210 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -453,6 +453,12 @@ bool initOpenCLRunEnv( GPUEnv *gpuInfo )
 
     clGetDeviceInfo(gpuInfo->mpDevID, CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT, sizeof(cl_uint),
                     &gpuInfo->mnPreferredVectorWidthFloat, nullptr);
+    SAL_INFO("opencl", "CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT=" << gpuInfo->mnPreferredVectorWidthFloat);
+
+    size_t nMaxParameterSize;
+    clGetDeviceInfo(gpuInfo->mpDevID, CL_DEVICE_MAX_PARAMETER_SIZE, sizeof(size_t),
+                    &nMaxParameterSize, nullptr);
+    SAL_INFO("opencl", "CL_DEVICE_MAX_PARAMETER_SIZE=" << nMaxParameterSize);
 
     return false;
 }
commit c62baccba2d4cdf61a2caca232278b7e6c6348d1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jun 27 18:11:04 2016 +0300

    Add some informative comments
    
    Change-Id: I3c85543efe824c06781486aff2d836e5ba48e66e

diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h
index 45e9f5b..0522d76 100644
--- a/opencl/inc/opencl_device_selection.h
+++ b/opencl/inc/opencl_device_selection.h
@@ -45,7 +45,12 @@ enum ds_status
 enum class DeviceType
 {
     None,
+    // NativeCPU means the traditional Calc interpreter code path. (That also includes the so-called
+    // "software interpreter", but note that it definitely does not mean *exclusively* that.)
     NativeCPU,
+    // OpenCLDevice means an OpenCL device as supplied by an OpenCL platform, which might well be
+    // implemented using code that runs on the CPU (and not a GPU). On Windows, OpenCL platforms
+    // typically provide two devices, one for the GPU and one for the CPU.
     OpenCLDevice
 };