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:
authorCampbell Barton <ideasman42@gmail.com>2012-06-09 21:22:52 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-09 21:22:52 +0400
commit0fbb6bff27139d66951fe223ff322c609d368a18 (patch)
treee75d0d4399e4b82746f4edbc0c2e20e8c25f7015 /intern/cycles/kernel/kernel_compat_cpu.h
parent2f60d9b0b9af1df967e29fd1822d82ffd2450d0f (diff)
style cleanup: block comments
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_cpu.h')
-rw-r--r--intern/cycles/kernel/kernel_compat_cpu.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index 2bd0b61b4fa..cc8f1f3323b 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -28,13 +28,13 @@
CCL_NAMESPACE_BEGIN
/* Assertions inside the kernel only work for the CPU device, so we wrap it in
- a macro which is empty for other devices */
+ * a macro which is empty for other devices */
#define kernel_assert(cond) assert(cond)
/* Texture types to be compatible with CUDA textures. These are really just
- simple arrays and after inlining fetch hopefully revert to being a simple
- pointer lookup. */
+ * simple arrays and after inlining fetch hopefully revert to being a simple
+ * pointer lookup. */
template<typename T> struct texture {
T fetch(int index)
@@ -43,7 +43,8 @@ template<typename T> struct texture {
return data[index];
}
- /*__m128 fetch_m128(int index)
+#if 0
+ __m128 fetch_m128(int index)
{
kernel_assert(index >= 0 && index < width);
return ((__m128*)data)[index];
@@ -53,7 +54,8 @@ template<typename T> struct texture {
{
kernel_assert(index >= 0 && index < width);
return ((__m128i*)data)[index];
- }*/
+ }
+#endif
float interp(float x, int size)
{