Fix T37817: cycles CUDA detection problem on Windows with non-ascii paths.

2014-01-11 00:47:58 +01:00
parent 9e1ca28589
commit 241fccaf6a
5 changed files with 66 additions and 20 deletions
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -355,7 +355,14 @@ public:
 		/* open module */
 		cuda_push_context();

-		CUresult result = cuModuleLoad(&cuModule, cubin.c_str());
+		string cubin_data;
+		CUresult result;
+
+		if (path_read_text(cubin, cubin_data))
+			result = cuModuleLoadData(&cuModule, cubin_data.c_str());
+		else
+			result = CUDA_ERROR_FILE_NOT_FOUND;
+
 		if(cuda_error_(result, "cuModuleLoad"))
 			cuda_error_message(string_printf("Failed loading CUDA kernel %s.", cubin.c_str()));