Commit: 010f3ee43871974abb99cd6f9e0204b29003fc4e
Author: Sergey Sharybin
Date: Thu Dec 25 14:11:37 2014 +0500
Branches: master
https://developer.blender.org/rB010f3ee43871974abb99cd6f9e0204b29003fc4e
Cycles: Fix compilation error on non-SSE2 architectures
===================================================================
M intern/cycles/kernel/kernel_compat_cpu.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h
b/intern/cycles/kernel/kernel_compat_cpu.h
index b475e11..a7a2fb8 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -52,6 +52,7 @@ template<typename T> struct texture {
return data[index];
}
+#ifdef __KERNEL_SSE2__
ccl_always_inline ssef fetch_ssef(int index)
{
kernel_assert(index >= 0 && index < width);
@@ -63,6 +64,7 @@ template<typename T> struct texture {
kernel_assert(index >= 0 && index < width);
return ((ssei*)data)[index];
}
+#endif
T *data;
int width;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
