From 7add13f1afb1ac24924336d5095c0884e662b615 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 13 Jun 2012 23:14:12 +0000 Subject: [PATCH] client: if available, use GPU model name from CAL for OpenCL model name svn path=/trunk/boinc/; revision=25757 --- checkin_notes | 8 ++++++++ client/coproc_detect.cpp | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index d156437776..7ba1ee445f 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4309,3 +4309,11 @@ David 13 June 2012 sched/ sched_types.cpp + +Charlie 13 June 2012 + - client: Reverse my logic of 16 Feb 2012: we now always use GPU model + name determined from CAL TargetID (if available) for OpenCL model + name of ATI / AMD GPUs because (we believe) it is more user-friendly. + + client/ + coproc_detect.cpp diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp index 6d37b297e9..6086e6564f 100644 --- a/client/coproc_detect.cpp +++ b/client/coproc_detect.cpp @@ -408,13 +408,13 @@ void COPROCS::get_opencl( if (ati.have_cal) { if (prop.device_num < (int)(ati_gpus.size())) { - // Always use GPU model name from OpenCL if available + // Always use GPU model name from CAL if available // for ATI / AMD GPUs because - // (we believe) it is more reliable and user-friendly. + // (we believe) it is more user-friendly. // Assumes OpenCL and CAL return the devices // in the same order // - strcpy(ati_gpus[prop.device_num].name, prop.name); + strcpy(prop.name, ati_gpus[prop.device_num].name); // Work around a bug in OpenCL which returns only // 1/2 of total global RAM size: use the value from CAL.