[Bf-blender-cvs] [0fdeb3abf6a] principled-v2: Temporary workaround to stop Eevee from crashing
Lukas Stockner
noreply at git.blender.org
Sun Oct 30 00:17:17 CEST 2022
Commit: 0fdeb3abf6a7499e4ffa3b30b3e75a30ed20fb19
Author: Lukas Stockner
Date: Sun Oct 30 00:14:03 2022 +0200
Branches: principled-v2
https://developer.blender.org/rB0fdeb3abf6a7499e4ffa3b30b3e75a30ed20fb19
Temporary workaround to stop Eevee from crashing
===================================================================
M source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
M source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
===================================================================
diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
index d186d61ee40..ec9ff909940 100644
--- a/source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
+++ b/source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
@@ -47,11 +47,15 @@ void node_bsdf_principled(vec4 base_color,
float weight,
const float do_diffuse,
const float do_clearcoat,
- const float do_refraction,
- const float do_multiscatter,
+ //const float do_refraction,
+ //const float do_multiscatter,
float do_sss,
out Closure result)
{
+ // TODO: Disabled because of GLSL argument limit
+ float do_multiscatter = 0.0f;
+ float do_refraction = 0.0f;
+
/* Match cycles. */
metallic = clamp(metallic, 0.0, 1.0);
transmission = clamp(transmission, 0.0, 1.0) * (1.0 - metallic);
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
index a803819826b..6282fb99fa6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
@@ -234,8 +234,8 @@ static int node_shader_gpu_bsdf_principled(GPUMaterial *mat,
out,
GPU_constant(&use_diffuse_f),
GPU_constant(&use_clear_f),
- GPU_constant(&use_refract_f),
- GPU_constant(&use_multi_scatter),
+ //GPU_constant(&use_refract_f),
+ //GPU_constant(&use_multi_scatter), // TODO: Disabled because of GLSL argument limit
GPU_uniform(&use_sss));
}
More information about the Bf-blender-cvs
mailing list