From 8ca018f062adda89bc5ab1eee454190f8863621d Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 5 Feb 2025 10:25:50 +0900
Subject: [PATCH] [qfcc] Ensure geometry shader invocations is set

It must always be at least 1, but specifying it in glsl is optional.

And now geometry shaders work :)
---
 tools/qfcc/include/glsl-lang.h    |  1 +
 tools/qfcc/source/glsl-parse.y    |  1 +
 tools/qfcc/source/glsl-sub_geom.c | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/tools/qfcc/include/glsl-lang.h b/tools/qfcc/include/glsl-lang.h
index 5371b8ee9..f4424b604 100644
--- a/tools/qfcc/include/glsl-lang.h
+++ b/tools/qfcc/include/glsl-lang.h
@@ -47,6 +47,7 @@ void glsl_init_vert (rua_ctx_t *ctx);
 void glsl_init_tesc (rua_ctx_t *ctx);
 void glsl_init_tese (rua_ctx_t *ctx);
 void glsl_init_geom (rua_ctx_t *ctx);
+int glsl_finish_geom (const char *file, rua_ctx_t *ctx);
 void glsl_init_frag (rua_ctx_t *ctx);
 
 int glsl_parse_string (const char *str, rua_ctx_t *ctx);
diff --git a/tools/qfcc/source/glsl-parse.y b/tools/qfcc/source/glsl-parse.y
index 2b97c0f78..e735316c7 100644
--- a/tools/qfcc/source/glsl-parse.y
+++ b/tools/qfcc/source/glsl-parse.y
@@ -2002,6 +2002,7 @@ language_t lang_glsl_geom = {
 	.default_float = true,
 	.init = glsl_init_geom,
 	.parse = glsl_yyparse,
+	.finish = glsl_finish_geom,
 	.extension = glsl_extension,
 	.version = glsl_version,
 	.on_include = glsl_on_include,
diff --git a/tools/qfcc/source/glsl-sub_geom.c b/tools/qfcc/source/glsl-sub_geom.c
index 3a3fc013c..7dceebb82 100644
--- a/tools/qfcc/source/glsl-sub_geom.c
+++ b/tools/qfcc/source/glsl-sub_geom.c
@@ -36,7 +36,9 @@
 #include "tools/qfcc/include/def.h"
 #include "tools/qfcc/include/diagnostic.h"
 #include "tools/qfcc/include/glsl-lang.h"
+#include "tools/qfcc/include/qfcc.h"
 #include "tools/qfcc/include/shared.h"
+#include "tools/qfcc/include/spirv.h"
 #include "tools/qfcc/include/strpool.h"
 #include "tools/qfcc/include/symtab.h"
 #include "tools/qfcc/include/type.h"
@@ -54,3 +56,17 @@ glsl_sublang_t glsl_geom_sublanguage = {
 	.interface_default_names = glsl_geom_interface_default_names,
 	.model_name = "Geometry",
 };
+
+int
+glsl_finish_geom (const char *file, rua_ctx_t *ctx)
+{
+	if (!pr.module || !pr.module->entry_points) {
+		return 1;
+	}
+	auto invocations = pr.module->entry_points->invocations;
+	if (!invocations) {
+		invocations = new_int_expr (1, false);
+		pr.module->entry_points->invocations = invocations;
+	}
+	return 1;
+}