[Bf-blender-cvs] [c913377] master: Cycles: Add CPU compat headers to some of the OSL implementation files

Sergey Sharybin noreply at git.blender.org
Sat May 9 16:57:37 CEST 2015


Commit: c9133778cf7e5ba488891fcb04bcb52e557d4d51
Author: Sergey Sharybin
Date:   Sat May 9 18:55:46 2015 +0500
Branches: master
https://developer.blender.org/rBc9133778cf7e5ba488891fcb04bcb52e557d4d51

Cycles: Add CPU compat headers to some of the OSL implementation files

This header was already included into some of the implementation files already,
and this change is needed for some upcoming changes in the way how kernel_types.h
works.

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

M	intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
M	intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
M	intern/cycles/kernel/osl/osl_bssrdf.cpp

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

diff --git a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
index 8f9c2ef..43929fb 100644
--- a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
@@ -34,6 +34,7 @@
 
 #include <OSL/genclosure.h>
 
+#include "kernel_compat_cpu.h"
 #include "osl_closures.h"
 
 #include "kernel_types.h"
diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
index c585174..497c4f0 100644
--- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
@@ -34,6 +34,7 @@
 
 #include <OSL/genclosure.h>
 
+#include "kernel_compat_cpu.h"
 #include "osl_closures.h"
 
 #include "kernel_types.h"
diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/osl_bssrdf.cpp
index 84ef85e..8899803 100644
--- a/intern/cycles/kernel/osl/osl_bssrdf.cpp
+++ b/intern/cycles/kernel/osl/osl_bssrdf.cpp
@@ -34,6 +34,7 @@
 
 #include <OSL/genclosure.h>
 
+#include "kernel_compat_cpu.h"
 #include "osl_bssrdf.h"
 #include "osl_closures.h"




More information about the Bf-blender-cvs mailing list