drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent missmatches between incompatible versions of the CUDA runtime and the CUDA driver.

Browse Source
This commit is contained in:
castano
2008-10-16 22:21:21 +00:00
parent aa37e7a868
commit cf18077eda
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/nvtt/cuda/CudaUtils.cpp
View File

@ -22,6 +22,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#include <nvcore/Debug.h> #include <nvcore/Debug.h>
#include <nvcore/Library.h>
#include "CudaUtils.h" #include "CudaUtils.h"
#if defined HAVE_CUDA #if defined HAVE_CUDA
@ -68,26 +69,35 @@ static bool isWow32()
#endif #endif
#if NV_OS_WIN32
static bool isCuda20DriverAvailable() static bool isCudaDriverAvailable(uint version)
{ {
bool result = false; #if NV_OS_WIN32
Library nvcuda("nvcuda.dll");
HINSTANCE nvcuda = LoadLibraryExA( "nvcuda.dll", NULL, 0 ); #else
if (nvcuda != NULL) Library nvcuda(NV_LIBRARY_NAME("cuda"));
#endif
if (!nvcuda.isValid())
{ {
FARPROC lcuStreamCreate = GetProcAddress( nvcuda, "cuStreamCreate" ); return false;
}
result = lcuStreamCreate != NULL;
if (version > 2000)
FreeLibrary( nvcuda ); {
void * address = nvcuda.bindSymbol("cuStreamCreate");
if (address == NULL) return false;
} }
return result; if (version > 2010)
{
void * address = nvcuda.bindSymbol("cuLoadDataEx");
if (address == NULL) return false;
}
return true;
} }
#endif
/// Determine if CUDA is available. /// Determine if CUDA is available.
bool nv::cuda::isHardwarePresent() bool nv::cuda::isHardwarePresent()
@ -111,12 +121,10 @@ bool nv::cuda::isHardwarePresent()
} }
// Make sure that CUDA driver matches CUDA runtime. // Make sure that CUDA driver matches CUDA runtime.
#if NV_OS_WIN32 && CUDART_VERSION >= 2000 if (!isCudaDriverAvailable(CUDART_VERSION))
if (!isCuda20DriverAvailable())
{ {
return false; return false;
} }
#endif
// @@ Make sure that warp size == 32 // @@ Make sure that warp size == 32
} }