From ca3dbecea66bc0628a2ad7400f5e51c522077a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernst=20Sj=C3=B6strand?= Date: Thu, 6 May 2021 15:22:54 +0200 Subject: [PATCH] nv50: Fix use of initializers on older compilers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following error on Ubuntu 18.04 with GCC 7. src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp:1448:72: sorry, unimplemented: non-trivial designated initializers not supported info_out->prop.cp.gmem[gmemSlot++] = {.valid = 1, .slot = i}; Reviewed-by: Ilia Mirkin Reviewed-by: Karol Herbst Fixes: f451854f3 ("nv50: add remapping of buffers/images into unified space") Signed-off-by: Ernst Sjöstrand Part-of: --- src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp index 3ca1355e976..3c0c9e79f1e 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp @@ -1445,7 +1445,7 @@ bool Source::scanDeclaration(const struct tgsi_full_declaration *decl) if (info->type == PIPE_SHADER_COMPUTE && info->target < NVISA_GF100_CHIPSET) { for (i = first; i <= last; i++) { bufferIds.insert(std::make_pair(i, gmemSlot)); - info_out->prop.cp.gmem[gmemSlot++] = {.valid = 1, .slot = i}; + info_out->prop.cp.gmem[gmemSlot++] = {.valid = 1, .image = 0, .slot = i}; assert(gmemSlot < 16); } }