From 407d16a7d9433cd6af07615cd055d05e85c81b0c Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 10 Dec 2012 06:50:44 -0800 Subject: [PATCH] client: clean up redundant and confusing GPU description --- checkin_notes | 1 + client/gpu_opencl.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/checkin_notes b/checkin_notes index 07d7d5e6cb..ef60e1f062 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7523,5 +7523,6 @@ Charlie 10 Dec 2012 client/ gpu_detect.cpp + gpu_opencl.cpp lib/ coproc.cpp,.h diff --git a/client/gpu_opencl.cpp b/client/gpu_opencl.cpp index 1b786f1802..3e3def6b1e 100644 --- a/client/gpu_opencl.cpp +++ b/client/gpu_opencl.cpp @@ -250,7 +250,9 @@ void COPROCS::get_opencl( } prop.opencl_device_index = device_index; - if (!nvidia.have_cuda) { + if (nvidia.have_cuda) { + prop.peak_flops = nvidia_gpus[prop.device_num].peak_flops; + } else { COPROC_NVIDIA c; c.opencl_prop = prop; c.set_peak_flops(); @@ -292,6 +294,7 @@ void COPROCS::get_opencl( // See also further workaround code for Macs. // prop.global_mem_size = ati_gpus[prop.device_num].attribs.localRAM * MEGA; + prop.peak_flops = ati_gpus[prop.device_num].peak_flops; } else { if (log_flags.coproc_debug) { msg_printf(0, MSG_INFO,