Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: refactor kernel closure storage to use structs per closure type.

Browse Source 
Reviewed By: dingto, sergey

Differential Revision: https://developer.blender.org/D2127
This commit is contained in:
Brecht Van Lommel
2016-07-25 03:03:23 +02:00
parent 1776f75c3b
commit 9b6ed3a42b
36 changed files with 1219 additions and 1364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
intern/cycles/kernel/osl/emissive.cpp
View File

@@ -36,7 +36,9 @@
#include "osl_closures.h"
#include "kernel_compat_cpu.h"
#include "kernel_types.h"
#include "closure/alloc.h"
#include "closure/emissive.h"
CCL_NAMESPACE_BEGIN
@@ -52,25 +54,10 @@ using namespace OSL;
///
class GenericEmissiveClosure : public CClosurePrimitive {
public:
GenericEmissiveClosure() : CClosurePrimitive(Emissive) { }
Color3 eval(const Vec3 &Ng, const Vec3 &omega_out) const
void setup(ShaderData *sd, int /* path_flag */, float3 weight)
{
float3 result = emissive_simple_eval(TO_FLOAT3(Ng), TO_FLOAT3(omega_out));
return TO_COLOR3(result);
}
void sample(const Vec3 &Ng, float randu, float randv,
Vec3 &omega_out, float &pdf) const
{
float3 omega_out_;
emissive_sample(TO_FLOAT3(Ng), randu, randv, &omega_out_, &pdf);
omega_out = TO_VEC3(omega_out_);
}
float pdf(const Vec3 &Ng, const Vec3 &omega_out) const
{
return emissive_pdf(TO_FLOAT3(Ng), TO_FLOAT3(omega_out));
closure_alloc(sd, sizeof(ShaderClosure), CLOSURE_EMISSION_ID, weight);
sd->flag |= SD_EMISSION;
}
};