diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-02 10:53:52 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-02 10:53:52 +0400 |
commit | 9c3025cd26d547667847c81ec53b503d876be906 (patch) | |
tree | 2103a0a15061dac143e686873694846e94441f32 /intern/cycles/device | |
parent | 7b83e3d6d7880124be4ed36d81c92953ec88bad0 (diff) |
Spelling
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/device_cuda.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 7fd1b79f6bc..fa1f0acadde 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -66,7 +66,7 @@ void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int dy, int w glColor3f(1.0f, 1.0f, 1.0f); if(rgba.data_type == TYPE_HALF) { - /* for multi devices, this assumes the ineffecient method that we allocate + /* for multi devices, this assumes the inefficient method that we allocate * all pixels on the device even though we only render to a subset */ GLhalf *data_pointer = (GLhalf*)rgba.data_pointer; data_pointer += 4*y*w; diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 1c7f3a05b0b..f0f32f87eed 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -732,8 +732,8 @@ public: const int start = task.shader_x; const int end = task.shader_x + task.shader_w; - bool cancelled = false; - for(int sample = 0; sample < task.num_samples && !cancelled; sample++) { + bool canceled = false; + for(int sample = 0; sample < task.num_samples && !canceled; sample++) { for(int shader_x = start; shader_x < end; shader_x += shader_chunk_size) { int shader_w = min(shader_chunk_size, end - shader_x); @@ -760,7 +760,7 @@ public: cuda_assert(cuCtxSynchronize()); if(task.get_cancel()) { - cancelled = false; + canceled = false; break; } } @@ -907,7 +907,7 @@ public: cuda_push_context(); - /* for multi devices, this assumes the ineffecient method that we allocate + /* for multi devices, this assumes the inefficient method that we allocate * all pixels on the device even though we only render to a subset */ size_t offset = 4*y*w; |