griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

EEVEE: World Sun Shadow no longer works in 4.5

Browse Source 
On some drivers, the GLSL compiler doesn't reflect the omitted
`local_size_*` of a compute shader inside `gl_WorkGroupSize`.

This lead to the 2D size computation of 1D workgroups to become
0 which was bypassing the parallel reduction algorithms.

Ensuring `local_size_*` are always set fixes the issue.

For clarity, also fix the 1D shaders to not use `gl_WorkGroupSize.y`.
This also fix a copy paste error in the Metal backend.

This issue affected AMD drivers on Windows.

Rel #142046

Candidate for backporting to 4.5 LTS.

Pull Request: https://projects.blender.org/blender/blender/pulls/144056
This commit is contained in:
Clément Foucault
2025-08-07 09:40:57 +02:00
committed by Clément Foucault
parent 936457871e
commit 16430b10f1
7 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_irradiance_comp.glsl
View File

@@ -48,7 +48,7 @@ void main()
local_sh_coefs[local_index][3] = sh.L1.Mp1;
/* Parallel sum. */
constexpr uint group_size = gl_WorkGroupSize.x * gl_WorkGroupSize.y;
constexpr uint group_size = gl_WorkGroupSize.x;
uint stride = group_size / 2;
for (int i = 0; i < 10; i++) {
barrier();

2
source/blender/draw/engines/eevee/shaders/eevee_lightprobe_sphere_sunlight_comp.glsl
View File

@@ -42,7 +42,7 @@ void main()
local_direction[local_index] = sun.direction;
/* Parallel sum. */
constexpr uint group_size = gl_WorkGroupSize.x * gl_WorkGroupSize.y;
constexpr uint group_size = gl_WorkGroupSize.x;
uint stride = group_size / 2;
for (int i = 0; i < 10; i++) {
barrier();

4
source/blender/gpu/intern/gpu_shader_create_info.hh
View File

@@ -119,7 +119,7 @@
# define FLAT(type, name) .flat(Type::type##_t, #name)
# define NO_PERSPECTIVE(type, name) .no_perspective(Type::type##_t, #name)
/* LOCAL_GROUP_SIZE(int size_x, int size_y = -1, int size_z = -1) */
/* LOCAL_GROUP_SIZE(int size_x, int size_y = 1, int size_z = 1) */
# define LOCAL_GROUP_SIZE(...) .local_group_size(__VA_ARGS__)
# define VERTEX_IN(slot, type, name) .vertex_in(slot, Type::type##_t, #name)
@@ -992,7 +992,7 @@ struct ShaderCreateInfo {
return *(Self *)this;
}
Self &local_group_size(int local_size_x = -1, int local_size_y = -1, int local_size_z = -1)
Self &local_group_size(int local_size_x, int local_size_y = 1, int local_size_z = 1)
{
compute_layout_.local_size_x = local_size_x;
compute_layout_.local_size_y = local_size_y;

10
source/blender/gpu/metal/mtl_shader_generator.mm
View File

@@ -924,15 +924,9 @@ bool MTLShader::generate_msl_from_glsl_compute(const shader::ShaderCreateInfo *i
ss_compute << "#define MTL_USE_WORKGROUP_SIZE 1" << std::endl;
ss_compute << "#define MTL_WORKGROUP_SIZE_X " << info->compute_layout_.local_size_x
<< std::endl;
ss_compute << "#define MTL_WORKGROUP_SIZE_Y "
<< ((info->compute_layout_.local_size_y != -1) ?
info->compute_layout_.local_size_y :
1)
ss_compute << "#define MTL_WORKGROUP_SIZE_Y " << info->compute_layout_.local_size_y
<< std::endl;
ss_compute << "#define MTL_WORKGROUP_SIZE_Z "
<< ((info->compute_layout_.local_size_y != -1) ?
info->compute_layout_.local_size_y :
1)
ss_compute << "#define MTL_WORKGROUP_SIZE_Z " << info->compute_layout_.local_size_z
<< std::endl;
}

11
source/blender/gpu/opengl/gl_shader.cc
View File

@@ -964,13 +964,10 @@ std::string GLShader::compute_layout_declare(const ShaderCreateInfo &info) const
{
std::stringstream ss;
ss << "\n/* Compute Layout. */\n";
ss << "layout(local_size_x = " << info.compute_layout_.local_size_x;
if (info.compute_layout_.local_size_y != -1) {
ss << ", local_size_y = " << info.compute_layout_.local_size_y;
}
if (info.compute_layout_.local_size_z != -1) {
ss << ", local_size_z = " << info.compute_layout_.local_size_z;
}
ss << "layout(";
ss << " local_size_x = " << info.compute_layout_.local_size_x;
ss << ", local_size_y = " << info.compute_layout_.local_size_y;
ss << ", local_size_z = " << info.compute_layout_.local_size_z;
ss << ") in;\n";
ss << "\n";
return ss.str();

11
source/blender/gpu/vulkan/vk_shader.cc
View File

@@ -1215,13 +1215,10 @@ std::string VKShader::compute_layout_declare(const shader::ShaderCreateInfo &inf
{
std::stringstream ss;
ss << "\n/* Compute Layout. */\n";
ss << "layout(local_size_x = " << info.compute_layout_.local_size_x;
if (info.compute_layout_.local_size_y != -1) {
ss << ", local_size_y = " << info.compute_layout_.local_size_y;
}
if (info.compute_layout_.local_size_z != -1) {
ss << ", local_size_z = " << info.compute_layout_.local_size_z;
}
ss << "layout(";
ss << " local_size_x = " << info.compute_layout_.local_size_x;
ss << ", local_size_y = " << info.compute_layout_.local_size_y;
ss << ", local_size_z = " << info.compute_layout_.local_size_z;
ss << ") in;\n";
ss << "\n";
return ss.str();

6
source/blender/python/gpu/gpu_py_shader_create_info.cc
View File

@@ -1220,15 +1220,15 @@ static PyObject *pygpu_shader_info_define(BPyGPUShaderCreateInfo *self, PyObject
PyDoc_STRVAR(
/* Wrap. */
pygpu_shader_info_local_group_size_doc,
".. method:: local_group_size(x, y=-1, z=-1)\n"
".. method:: local_group_size(x, y=1, z=1)\n"
"\n"
" Specify the local group size for compute shaders.\n"
"\n"
" :arg x: The local group size in the x dimension.\n"
" :type x: int\n"
" :arg y: The local group size in the y dimension. Optional. Defaults to -1.\n"
" :arg y: The local group size in the y dimension. Optional. Defaults to 1.\n"
" :type y: int\n"
" :arg z: The local group size in the z dimension. Optional. Defaults to -1.\n"
" :arg z: The local group size in the z dimension. Optional. Defaults to 1.\n"
" :type z: int\n");
static PyObject *pygpu_shader_info_local_group_size(BPyGPUShaderCreateInfo *self, PyObject *args)
{