From ef47ce2397d4ed453fe01d994d13a13f442ec3bb Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 1 Jul 2016 18:24:48 +0100 Subject: tdf#90336 - further cleanup of OpenCL options page. Still problematic; since we only show OpenCL as being available if it has already been initialized and used. Change-Id: I5e82a3f778f4f2025408330b6d9da51402d01e79 Reviewed-on: https://gerrit.libreoffice.org/26866 Tested-by: Jenkins Reviewed-by: Michael Meeks --- cui/source/options/optopencl.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'cui/source/options/optopencl.cxx') diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index ec8f432816eb..cbe37dd6ed54 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -47,20 +47,17 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) { get(mpUseSwInterpreter, "useswinterpreter"); get(mpUseOpenCL, "useopencl"); - get(clUsed,"openclused"); + get(mpOclUsed,"openclused"); + get(mpOclNotUsed,"openclnotused"); mpUseSwInterpreter->Check(officecfg::Office::Common::Misc::UseSwInterpreter::get()); mpUseOpenCL->Check(maConfig.mbUseOpenCL); mpUseOpenCL->SetClickHdl(LINK(this, SvxOpenCLTabPage, EnableOpenCLHdl)); - cl_device_id idTest=opencl::gpuEnv.mpDevID; - if(!idTest) - { - clUsed->SetText("Yes"); - }else{ - clUsed->SetText("No"); - } + bool bCLUsed = opencl::GPUEnv::isOpenCLEnabled(); + mpOclUsed->Show(bCLUsed); + mpOclNotUsed->Show(!bCLUsed); } SvxOpenCLTabPage::~SvxOpenCLTabPage() -- cgit