diff --git a/checkin_notes b/checkin_notes index 2951595621..3be4b3aae1 100644 --- a/checkin_notes +++ b/checkin_notes @@ -312,3 +312,11 @@ David 8 Jan 2012 client/ app_start.cpp + +Charlie 9 Jan 2012 + - client: OpenCL 1.1 has no API for determining available GPU RAM, so if + CAL is not present for ATI / AMD GPU or if CUDA is not present for + NVIDIA GPU, set available GPU RAM equal to total GPU RAM. + + client/ + coproc_detect.cpp diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp index 1989a79d8f..817a104b89 100644 --- a/client/coproc_detect.cpp +++ b/client/coproc_detect.cpp @@ -329,6 +329,7 @@ void COPROCS::get_opencl( } else { nvidia.find_best_opencls(use_all, nvidia_opencls, ignore_nvidia_dev); nvidia.prop.totalGlobalMem = nvidia.opencl_prop.global_mem_size; + nvidia.available_ram = nvidia.opencl_prop.global_mem_size; nvidia.prop.clockRate = nvidia.opencl_prop.max_clock_frequency * 1000; } @@ -350,6 +351,7 @@ void COPROCS::get_opencl( } else { ati.find_best_opencls(use_all, ati_opencls, ignore_ati_dev); ati.attribs.localRAM = ati.opencl_prop.global_mem_size/MEGA; + ati.available_ram = ati.opencl_prop.global_mem_size/MEGA; ati.attribs.engineClock = ati.opencl_prop.max_clock_frequency; } // End if (! ati.have_cal)