[boinc] 01/04: New upstream version 7.8.4+dfsg
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Tue Nov 14 08:36:46 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository boinc.
commit 5f8bc32cfda2d57eeb4176f93dfff59208902594
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Nov 14 09:19:21 2017 +0100
New upstream version 7.8.4+dfsg
---
client/gpu_opencl.cpp | 8 +++++---
configure.ac | 2 +-
version.log | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/client/gpu_opencl.cpp b/client/gpu_opencl.cpp
index 76d36e8..21a83fd 100644
--- a/client/gpu_opencl.cpp
+++ b/client/gpu_opencl.cpp
@@ -1074,6 +1074,7 @@ void COPROCS::opencl_get_ati_mem_size_from_opengl(vector<string>& warnings) {
CGLRendererInfoObj info;
long i, j;
GLint numRenderers = 0, rv = 0, deviceVRAM, rendererID;
+ cl_ulong deviceMemSize;
CGLError theErr2 = kCGLNoError;
CGLContextObj curr_ctx = CGLGetCurrentContext (); // save current CGL context
int ati_gpu_index = 0;
@@ -1129,7 +1130,7 @@ void COPROCS::opencl_get_ati_mem_size_from_opengl(vector<string>& warnings) {
// what is the VRAM?
CGLError notAvail = CGLDescribeRenderer (info, i, kCGLRPVideoMemoryMegabytes, &deviceVRAM);
if (notAvail == kCGLNoError) {
- deviceVRAM = deviceVRAM * (1024*1024);
+ deviceMemSize = ((cl_ulong)deviceVRAM) * (1024L*1024L);
} else { // kCGLRPVideoMemoryMegabytes is not available before OS 10.7
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -1137,6 +1138,7 @@ void COPROCS::opencl_get_ati_mem_size_from_opengl(vector<string>& warnings) {
// defined in later SDKs, so use a literal value here instead
// CGLDescribeRenderer (info, i, kCGLRPVideoMemory, &deviceVRAM);
CGLDescribeRenderer (info, i, (CGLRendererProperty)120, &deviceVRAM);
+ deviceMemSize = deviceVRAM;
#pragma clang diagnostic pop
}
@@ -1160,8 +1162,8 @@ void COPROCS::opencl_get_ati_mem_size_from_opengl(vector<string>& warnings) {
// get vendor string from renderer
const GLubyte * strVend = glGetString (GL_VENDOR);
if (is_AMD((char *)strVend)) {
- ati_opencls[ati_gpu_index].global_mem_size = deviceVRAM;
- ati_opencls[ati_gpu_index].opencl_available_ram = deviceVRAM;
+ ati_opencls[ati_gpu_index].global_mem_size = deviceMemSize;
+ ati_opencls[ati_gpu_index].opencl_available_ram = deviceMemSize;
if (log_flags.coproc_debug) {
// For some GPUs, one API returns "ATI" but the other API returns
diff --git a/configure.ac b/configure.ac
index 9bd7cd4..9ddb749 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
-AC_INIT(BOINC, 7.8.3)
+AC_INIT(BOINC, 7.8.4)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
diff --git a/version.log b/version.log
index bb9f54c..79e3242 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-7.8.3
+7.8.4
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list