ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: Cycles table precompute app build failure

Browse source
This commit is contained in:
Brecht Van Lommel 2024-12-26 17:53:53 +01:00
parent fe368edbb3
commit 4453ca25b4
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
intern/cycles/app/cycles_precompute.cpp
View file

@ -26,6 +26,8 @@ CCL_NAMESPACE_BEGIN
static float precompute_ggx_E(float rough, float mu, float3 rand)
{
KernelGlobalsCPU kg;
MicrofacetBsdf bsdf;
bsdf.weight = one_float3();
bsdf.sample_weight = 1.0f;
@ -40,7 +42,8 @@ static float precompute_ggx_E(float rough, float mu, float3 rand)
Spectrum eval;
float pdf = 0.0f, sampled_eta;
float2 sampled_roughness;
bsdf_microfacet_ggx_sample((ShaderClosure *)&bsdf,
bsdf_microfacet_ggx_sample(&kg,
(ShaderClosure *)&bsdf,
make_float3(0.0f, 0.0f, 1.0f),
make_float3(sqrtf(1.0f - sqr(mu)), 0.0f, mu),
rand,
@ -57,6 +60,8 @@ static float precompute_ggx_E(float rough, float mu, float3 rand)
static float precompute_ggx_glass_E(float rough, float mu, float eta, float3 rand)
{
KernelGlobalsCPU kg;
MicrofacetBsdf bsdf;
bsdf.weight = one_float3();
bsdf.sample_weight = 1.0f;
@ -71,7 +76,8 @@ static float precompute_ggx_glass_E(float rough, float mu, float eta, float3 ran
Spectrum eval;
float pdf = 0.0f, sampled_eta;
float2 sampled_roughness;
bsdf_microfacet_ggx_sample((ShaderClosure *)&bsdf,
bsdf_microfacet_ggx_sample(&kg,
(ShaderClosure *)&bsdf,
make_float3(0.0f, 0.0f, 1.0f),
make_float3(sqrtf(1.0f - sqr(mu)), 0.0f, mu),
rand,
@ -89,6 +95,8 @@ static float precompute_ggx_glass_E(float rough, float mu, float eta, float3 ran
static float precompute_ggx_gen_schlick_s(
float rough, float mu, float eta, float exponent, float3 rand)
{
KernelGlobalsCPU kg;
MicrofacetBsdf bsdf;
bsdf.weight = one_float3();
bsdf.sample_weight = 1.0f;
@ -113,7 +121,8 @@ static float precompute_ggx_gen_schlick_s(
Spectrum eval;
float pdf = 0.0f, sampled_eta;
float2 sampled_roughness;
bsdf_microfacet_ggx_sample((ShaderClosure *)&bsdf,
bsdf_microfacet_ggx_sample(&kg,
(ShaderClosure *)&bsdf,
make_float3(0.0f, 0.0f, 1.0f),
make_float3(sqrtf(1.0f - sqr(mu)), 0.0f, mu),
rand,

6
intern/cycles/kernel/device/cpu/globals.h
View file

@ -33,15 +33,15 @@ template<typename T> struct kernel_array {
return data[index];
}
T *data;
int width;
T *data = nullptr;
int width = 0;
};
typedef struct KernelGlobalsCPU {
#define KERNEL_DATA_ARRAY(type, name) kernel_array<type> name;
#include "kernel/data_arrays.h"
KernelData data;
KernelData data = {};
#ifdef __OSL__
/* On the CPU, we also have the OSL globals here. Most data structures are shared