diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-09 13:16:42 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-03-18 22:53:04 +0300 |
| commit | 374cb32d4a43b5f959f7fbd96074cfae5f265dab (patch) | |
| tree | a59854dc862803a034b24b37b2644e386348911e /source/blender/gpu/opengl | |
| parent | 2580869901f20d6563c633906245a59377322321 (diff) | |
GLShader: Fix two small issues with compute shader generated code
Diffstat (limited to 'source/blender/gpu/opengl')
| -rw-r--r-- | source/blender/gpu/opengl/gl_shader.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index 256702b60c5..c5130628b84 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -667,7 +667,7 @@ std::string GLShader::compute_layout_declare(const ShaderCreateInfo &info) const ss << ", local_size_y = " << info.compute_layout_.local_size_y; } if (info.compute_layout_.local_size_z != -1) { - ss << ", local_size_y = " << info.compute_layout_.local_size_z; + ss << ", local_size_z = " << info.compute_layout_.local_size_z; } ss << ") in;\n"; ss << "\n"; @@ -836,6 +836,10 @@ static char *glsl_patch_compute_get() /* Version need to go first. */ STR_CONCAT(patch, slen, "#version 430\n"); STR_CONCAT(patch, slen, "#extension GL_ARB_compute_shader :enable\n"); + + /* Array compat. */ + STR_CONCAT(patch, slen, "#define array(_type) _type[]\n"); + BLI_assert(slen < sizeof(patch)); return patch; } |