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:
authorSergey Sharybin <sergey@blender.org>2021-10-21 15:52:34 +0300
committerSergey Sharybin <sergey@blender.org>2021-10-25 10:27:21 +0300
commit8733d310e54766d7c07d101e8959bd9f3eaf0daf (patch)
tree16d85ec44792de281ff5cf281b43146a152012d3 /intern/cycles/render/osl.h
parentb714f9bf437de32dab768d4c28674ca1f3e5b325 (diff)
Cycles: Revert all host update specific changes
The approach didn't turn out to be that useful after all as there are unavoidable dependencies of data from the device. For example, to know whether object intersects volume or not it is required to run displacement kernels. The way of splitting host and device updates caused state where some data is not yet available, causing confusion and leaving code to be error-prone.
Diffstat (limited to 'intern/cycles/render/osl.h')
-rw-r--r--intern/cycles/render/osl.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/render/osl.h b/intern/cycles/render/osl.h
index 1da8d8d0026..dfeec54d915 100644
--- a/intern/cycles/render/osl.h
+++ b/intern/cycles/render/osl.h
@@ -79,8 +79,6 @@ class OSLShaderManager : public ShaderManager {
return true;
}
- void host_update_specific(Scene *scene, Progress &progress) override;
-
void device_update_specific(Device *device,
DeviceScene *dscene,
Scene *scene,
@@ -140,7 +138,7 @@ class OSLCompiler {
OSL::ShadingSystem *shadingsys,
Scene *scene);
#endif
- void compile(Shader *shader);
+ void compile(OSLGlobals *og, Shader *shader);
void add(ShaderNode *node, const char *name, bool isfilepath = false);