Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-07-05 16:25:34 +0400
committerThomas Dinges <blender@dingto.org>2014-07-05 16:25:34 +0400
commit9acabc13de8f437601b6cca09118baba9f44ee81 (patch)
treec1abac036931d3b75cfd758a5f2e6074156579af /intern/cycles
parent5aec61f8493f5876a52ec67871148803396ff223 (diff)
Cleanup: Typo fixes.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/device/device_cuda.cpp8
-rw-r--r--intern/cycles/kernel/kernel.cu2
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 3bb16c7b14f..d1d227b3761 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 83b1381a0f5..9208acc232e 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