From 5248e5a4edf9e39e73d2bd40d2e9063d4f8818f3 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 20 Jan 2025 15:03:27 +0900
Subject: [PATCH] [qfcc] Emit base vulkan capabilities

I probably missed some, and I should make the emission more selective,
but my vertex shaders all pass spirv-val (probably don't work, though).
---
 tools/qfcc/source/glsl-builtins.c | 24 ++++++++++++++++++++----
 tools/qfcc/source/qc-parse.y      |  1 -
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tools/qfcc/source/glsl-builtins.c b/tools/qfcc/source/glsl-builtins.c
index 93b47927e..9095b0d67 100644
--- a/tools/qfcc/source/glsl-builtins.c
+++ b/tools/qfcc/source/glsl-builtins.c
@@ -1306,6 +1306,21 @@ bool allInvocations(bool value)
 bool allInvocationsEqual(bool value)
 #endif
 
+static SpvCapability glsl_base_capabilities[] = {
+	SpvCapabilityMatrix,
+	SpvCapabilityShader,
+	SpvCapabilityInputAttachment,
+	SpvCapabilitySampled1D,
+	SpvCapabilityImage1D,
+	SpvCapabilitySampledBuffer,
+	SpvCapabilityImageBuffer,
+	SpvCapabilityImageQuery,
+	SpvCapabilityDerivativeControl,
+	SpvCapabilityStorageImageExtendedFormats,
+	SpvCapabilityDeviceGroup,
+	SpvCapabilityShaderNonUniform,
+};
+
 void
 glsl_multiview (int behavior, void *scanner)
 {
@@ -1374,6 +1389,11 @@ glsl_init_common (rua_ctx_t *ctx)
 	qc_parse_string (glsl_atomic_functions, &rua_ctx);
 	qc_parse_string (glsl_image_functions, &rua_ctx);
 	glsl_parse_vars (glsl_system_constants, ctx);
+
+	for (size_t i = 0; i < countof (glsl_base_capabilities); i++) {
+		auto cap = glsl_base_capabilities[i];
+		spirv_add_capability (pr.module, cap);
+	}
 }
 
 void
@@ -1381,8 +1401,6 @@ glsl_init_comp (rua_ctx_t *ctx)
 {
 	glsl_init_common (ctx);
 	glsl_parse_vars (glsl_compute_vars, ctx);
-
-	spirv_add_capability (pr.module, SpvCapabilityShader);
 }
 
 void
@@ -1393,7 +1411,6 @@ glsl_init_vert (rua_ctx_t *ctx)
 	rua_ctx_t rua_ctx = { .language = &lang_ruamoko };
 	qc_parse_string (glsl_other_texture_functions, &rua_ctx);
 
-	spirv_add_capability (pr.module, SpvCapabilityShader);
 	pr.module->default_model = SpvExecutionModelVertex;
 }
 
@@ -1443,6 +1460,5 @@ glsl_init_frag (rua_ctx_t *ctx)
 	qc_parse_string (glsl_fragment_functions, &rua_ctx);
 	qc_parse_string (glsl_frag_texture_functions, &rua_ctx);
 
-	spirv_add_capability (pr.module, SpvCapabilityShader);
 	pr.module->default_model = SpvExecutionModelFragment;
 }
diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y
index efad7d82d..dc122d849 100644
--- a/tools/qfcc/source/qc-parse.y
+++ b/tools/qfcc/source/qc-parse.y
@@ -3278,7 +3278,6 @@ rua_init (rua_ctx_t *ctx)
 		static module_t module;		//FIXME probably not what I want
 		pr.module = &module;
 
-		spirv_add_capability (pr.module, SpvCapabilityShader);
 		//FIXME unhardcode
 		spirv_add_extension (pr.module, "SPV_KHR_multiview");
 		spirv_add_extinst_import (pr.module, "GLSL.std.450");