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.vfx@gmail.com>2015-11-21 20:31:58 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-11-21 21:00:29 +0300
commitf547bf2f1013a86dc5a6646707256a174c2a1b47 (patch)
treefc04536a4cfb2398a355d333e0b16186805268ca /intern/cycles/render/shader.h
parentc08727ebabae1d84c9d4e3096a61ef131177d4d5 (diff)
Cycles: Make requested features struct aware of subsurface BSDF
This way we'll be able to disable SSS for the scene-adaptive kernel.
Diffstat (limited to 'intern/cycles/render/shader.h')
-rw-r--r--intern/cycles/render/shader.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index e34e78476a0..b19b1c619a2 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -43,6 +43,7 @@ CCL_NAMESPACE_BEGIN
class Device;
class DeviceScene;
+class DeviceRequestedFeatures;
class Mesh;
class Progress;
class Scene;
@@ -168,8 +169,7 @@ public:
/* Selective nodes compilation. */
void get_requested_features(Scene *scene,
- int& max_group,
- int& features);
+ DeviceRequestedFeatures *requested_features);
protected:
ShaderManager();
@@ -183,8 +183,7 @@ protected:
size_t beckmann_table_offset;
void get_requested_graph_features(ShaderGraph *graph,
- int& max_group,
- int& features);
+ DeviceRequestedFeatures *requested_features);
};
CCL_NAMESPACE_END