From 374cb32d4a43b5f959f7fbd96074cfae5f265dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 9 Feb 2022 11:16:42 +0100 Subject: GLShader: Fix two small issues with compute shader generated code --- source/blender/gpu/opengl/gl_shader.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/gpu/opengl') 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; } -- cgit v1.2.3