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
path: root/intern/cycles/kernel/osl
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/kernel/osl')
-rw-r--r--intern/cycles/kernel/osl/CMakeLists.txt16
-rw-r--r--intern/cycles/kernel/osl/background.cpp2
-rw-r--r--intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp4
-rw-r--r--intern/cycles/kernel/osl/bsdf_phong_ramp.cpp4
-rw-r--r--intern/cycles/kernel/osl/bssrdf.cpp (renamed from intern/cycles/kernel/osl/osl_bssrdf.cpp)4
-rw-r--r--intern/cycles/kernel/osl/closures.cpp (renamed from intern/cycles/kernel/osl/osl_closures.cpp)10
-rw-r--r--intern/cycles/kernel/osl/closures.h (renamed from intern/cycles/kernel/osl/osl_closures.h)4
-rw-r--r--intern/cycles/kernel/osl/emissive.cpp4
-rw-r--r--intern/cycles/kernel/osl/globals.h (renamed from intern/cycles/kernel/osl/osl_globals.h)10
-rw-r--r--intern/cycles/kernel/osl/services.cpp (renamed from intern/cycles/kernel/osl/osl_services.cpp)28
-rw-r--r--intern/cycles/kernel/osl/services.h (renamed from intern/cycles/kernel/osl/osl_services.h)0
-rw-r--r--intern/cycles/kernel/osl/shader.cpp (renamed from intern/cycles/kernel/osl/osl_shader.cpp)14
-rw-r--r--intern/cycles/kernel/osl/shader.h (renamed from intern/cycles/kernel/osl/osl_shader.h)2
13 files changed, 51 insertions, 51 deletions
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index 7be1b7129e0..f226c95766f 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -25,17 +25,17 @@ set(SRC
bsdf_diffuse_ramp.cpp
bsdf_phong_ramp.cpp
emissive.cpp
- osl_bssrdf.cpp
- osl_closures.cpp
- osl_services.cpp
- osl_shader.cpp
+ bssrdf.cpp
+ closures.cpp
+ services.cpp
+ shader.cpp
)
set(HEADER_SRC
- osl_closures.h
- osl_globals.h
- osl_services.h
- osl_shader.h
+ closures.h
+ globals.h
+ services.h
+ shader.h
)
set(LIB
diff --git a/intern/cycles/kernel/osl/background.cpp b/intern/cycles/kernel/osl/background.cpp
index bb290a5ced2..540180f99e8 100644
--- a/intern/cycles/kernel/osl/background.cpp
+++ b/intern/cycles/kernel/osl/background.cpp
@@ -34,7 +34,7 @@
#include <OSL/genclosure.h>
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
// clang-format off
#include "kernel/device/cpu/compat.h"
diff --git a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
index 2ec7f14c0fa..768531a0bf9 100644
--- a/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
@@ -35,10 +35,10 @@
#include <OSL/genclosure.h>
#include "kernel/device/cpu/compat.h"
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
// clang-format off
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/bsdf_diffuse_ramp.h"
// clang-format on
diff --git a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
index 90160fba962..d34a33216a0 100644
--- a/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
+++ b/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
@@ -35,10 +35,10 @@
#include <OSL/genclosure.h>
#include "kernel/device/cpu/compat.h"
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
// clang-format off
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/bsdf_phong_ramp.h"
// clang-format on
diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/bssrdf.cpp
index 3b8661ce45d..7c7f1ce157f 100644
--- a/intern/cycles/kernel/osl/osl_bssrdf.cpp
+++ b/intern/cycles/kernel/osl/bssrdf.cpp
@@ -33,10 +33,10 @@
#include <OSL/genclosure.h>
#include "kernel/device/cpu/compat.h"
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
// clang-format off
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/bsdf_util.h"
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/closures.cpp
index 89bab35b60b..adc0f50aefb 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/closures.cpp
@@ -33,17 +33,17 @@
#include <OSL/genclosure.h>
#include <OSL/oslclosure.h>
-#include "kernel/osl/osl_closures.h"
-#include "kernel/osl/osl_shader.h"
+#include "kernel/osl/closures.h"
+#include "kernel/osl/shader.h"
-#include "util/util_math.h"
-#include "util/util_param.h"
+#include "util/math.h"
+#include "util/param.h"
// clang-format off
#include "kernel/device/cpu/compat.h"
#include "kernel/device/cpu/globals.h"
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/bsdf_util.h"
diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/closures.h
index 7869d793737..8f573e89734 100644
--- a/intern/cycles/kernel/osl/osl_closures.h
+++ b/intern/cycles/kernel/osl/closures.h
@@ -33,8 +33,8 @@
#ifndef __OSL_CLOSURES_H__
#define __OSL_CLOSURES_H__
-#include "kernel/kernel_types.h"
-#include "util/util_types.h"
+#include "kernel/types.h"
+#include "util/types.h"
#include <OSL/genclosure.h>
#include <OSL/oslclosure.h>
diff --git a/intern/cycles/kernel/osl/emissive.cpp b/intern/cycles/kernel/osl/emissive.cpp
index 5a7fe14b22e..2615e300a92 100644
--- a/intern/cycles/kernel/osl/emissive.cpp
+++ b/intern/cycles/kernel/osl/emissive.cpp
@@ -34,11 +34,11 @@
#include <OSL/genclosure.h>
-#include "kernel/osl/osl_closures.h"
+#include "kernel/osl/closures.h"
// clang-format off
#include "kernel/device/cpu/compat.h"
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
#include "kernel/closure/alloc.h"
#include "kernel/closure/emissive.h"
// clang-format on
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/globals.h
index f1789f0d7eb..126ace0086e 100644
--- a/intern/cycles/kernel/osl/osl_globals.h
+++ b/intern/cycles/kernel/osl/globals.h
@@ -24,11 +24,11 @@
# include <OpenImageIO/refcnt.h>
# include <OpenImageIO/unordered_map_concurrent.h>
-# include "util/util_map.h"
-# include "util/util_param.h"
-# include "util/util_thread.h"
-# include "util/util_unique_ptr.h"
-# include "util/util_vector.h"
+# include "util/map.h"
+# include "util/param.h"
+# include "util/thread.h"
+# include "util/unique_ptr.h"
+# include "util/vector.h"
# ifndef WIN32
using std::isfinite;
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/services.cpp
index 56b04fd280e..ca0a5a068b3 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/services.cpp
@@ -30,36 +30,36 @@
#include "scene/object.h"
#include "scene/scene.h"
-#include "kernel/osl/osl_closures.h"
-#include "kernel/osl/osl_globals.h"
-#include "kernel/osl/osl_services.h"
-#include "kernel/osl/osl_shader.h"
+#include "kernel/osl/closures.h"
+#include "kernel/osl/globals.h"
+#include "kernel/osl/services.h"
+#include "kernel/osl/shader.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_string.h"
+#include "util/foreach.h"
+#include "util/log.h"
+#include "util/string.h"
// clang-format off
#include "kernel/device/cpu/compat.h"
#include "kernel/device/cpu/globals.h"
#include "kernel/device/cpu/image.h"
-#include "kernel/util/util_differential.h"
+#include "kernel/util/differential.h"
-#include "kernel/integrator/integrator_state.h"
-#include "kernel/integrator/integrator_state_flow.h"
+#include "kernel/integrator/state.h"
+#include "kernel/integrator/state_flow.h"
#include "kernel/geom/geom.h"
#include "kernel/bvh/bvh.h"
#include "kernel/camera/camera.h"
-#include "kernel/camera/camera_projection.h"
+#include "kernel/camera/projection.h"
-#include "kernel/integrator/integrator_path_state.h"
-#include "kernel/integrator/integrator_shader_eval.h"
+#include "kernel/integrator/path_state.h"
+#include "kernel/integrator/shader_eval.h"
-#include "kernel/util/util_color.h"
+#include "kernel/util/color.h"
// clang-format on
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/services.h
index d9f57c642ad..d9f57c642ad 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/services.h
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/shader.cpp
index 6426a09b33d..33633c69e29 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/shader.cpp
@@ -20,16 +20,16 @@
#include "kernel/device/cpu/compat.h"
#include "kernel/device/cpu/globals.h"
-#include "kernel/kernel_types.h"
+#include "kernel/types.h"
-#include "kernel/geom/geom_object.h"
+#include "kernel/geom/object.h"
-#include "kernel/integrator/integrator_state.h"
+#include "kernel/integrator/state.h"
-#include "kernel/osl/osl_closures.h"
-#include "kernel/osl/osl_globals.h"
-#include "kernel/osl/osl_services.h"
-#include "kernel/osl/osl_shader.h"
+#include "kernel/osl/closures.h"
+#include "kernel/osl/globals.h"
+#include "kernel/osl/services.h"
+#include "kernel/osl/shader.h"
// clang-format on
#include "scene/attribute.h"
diff --git a/intern/cycles/kernel/osl/osl_shader.h b/intern/cycles/kernel/osl/shader.h
index 037a18a1f19..7d68d4eae7f 100644
--- a/intern/cycles/kernel/osl/osl_shader.h
+++ b/intern/cycles/kernel/osl/shader.h
@@ -29,7 +29,7 @@
* This means no thread state must be passed along in the kernel itself.
*/
-# include "kernel/kernel_types.h"
+# include "kernel/types.h"
CCL_NAMESPACE_BEGIN
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 09:20:19 +0300