summaryrefslogtreecommitdiff
path: root/opencl/source/openclwrapper.cxx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-04-20 22:19:47 +0900
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-04-25 08:53:18 +0000
commit8d3dd678bf9fd50a736cc0ff956f1efd7e660502 (patch)
tree2c03ac868b34340a0869d958cccca8d5cf2420a7 /opencl/source/openclwrapper.cxx
parent91e73f12fec47c8896122cfe72eb374bd283a132 (diff)
tdf#99453 opencl: better logging of devices and device selection
changes: - Clew misses a lot of things, added defines needed for gathering platform and device info. - Refactored profile saving and loading to use libxml2 instead the weird type of saving the profile data. - Added an additional "log" file which is similar to the OpenGL but it writes the OpenCL relevant information like which devices and platforms are available (+ all the extra useful version information) and which device was selected (if any at all). (cherry picked from commit 334e2dc9c3da4519e31e0452a40d3a958c401876) Change-Id: I0fe793c756f8f4f1761fe120fc361df36e581903 Reviewed-on: https://gerrit.libreoffice.org/24303 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'opencl/source/openclwrapper.cxx')
-rw-r--r--opencl/source/openclwrapper.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 7bbcb2c3bce3..e488f79fb8bc 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -703,9 +703,8 @@ bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEv
rtl::Bootstrap::expandMacros(url);
OUString path;
osl::FileBase::getSystemPathFromFileURL(url,path);
- OString dsFileName = rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8);
- ds_device pSelectedDevice = getDeviceSelection(dsFileName.getStr(), bForceEvaluation);
- pDeviceId = pSelectedDevice.oclDeviceID;
+ ds_device pSelectedDevice = getDeviceSelection(path, bForceEvaluation);
+ pDeviceId = pSelectedDevice.aDeviceID;
}