[Bf-blender-cvs] [9acabc1] master: Cleanup: Typo fixes.

Thomas Dinges noreply at git.blender.org
Sat Jul 5 14:26:02 CEST 2014


Commit: 9acabc13de8f437601b6cca09118baba9f44ee81
Author: Thomas Dinges
Date:   Sat Jul 5 14:25:34 2014 +0200
https://developer.blender.org/rB9acabc13de8f437601b6cca09118baba9f44ee81

Cleanup: Typo fixes.

===================================================================

M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/kernel/kernel.cu

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 3bb16c7..d1d227b 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -102,14 +102,14 @@ public:
 
 			case CUDA_ERROR_NOT_READY: return "CUDA not ready";
 
-			case CUDA_ERROR_ILLEGAL_ADDRESS: return "Illegal adress";
+			case CUDA_ERROR_ILLEGAL_ADDRESS: return "Illegal address";
 			case CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES: return "Launch exceeded resources";
-			case CUDA_ERROR_LAUNCH_TIMEOUT: return "Launch exceeded timeout";
+			case CUDA_ERROR_LAUNCH_TIMEOUT: return "Launch exceeded time out";
 			case CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING: return "Launch with incompatible texturing";
 			case CUDA_ERROR_HARDWARE_STACK_ERROR: return "Stack error";
 			case CUDA_ERROR_ILLEGAL_INSTRUCTION: return "Illegal instruction";
-			case CUDA_ERROR_MISALIGNED_ADDRESS: return "Misaligned adress";
-			case CUDA_ERROR_INVALID_ADDRESS_SPACE: return "Invalid adress space";
+			case CUDA_ERROR_MISALIGNED_ADDRESS: return "Misaligned address";
+			case CUDA_ERROR_INVALID_ADDRESS_SPACE: return "Invalid address space";
 			case CUDA_ERROR_INVALID_PC: return "Invalid program counter";
 			case CUDA_ERROR_LAUNCH_FAILED: return "Launch failed";
 
diff --git a/intern/cycles/kernel/kernel.cu b/intern/cycles/kernel/kernel.cu
index 83b1381..9208acc 100644
--- a/intern/cycles/kernel/kernel.cu
+++ b/intern/cycles/kernel/kernel.cu
@@ -66,7 +66,7 @@
 
 /* unknown architecture */
 #else
-#error "Unknown or unuspported CUDA architecture, can't determine launch bounds"
+#error "Unknown or unsupported CUDA architecture, can't determine launch bounds"
 #endif
 
 /* compute number of threads per block and minimum blocks per multiprocessor




More information about the Bf-blender-cvs mailing list