Compiler: Add CMultiplePushConstantError

NazaraEngine · Jan 15, 2025 · 7b97ce7 · 7b97ce7
1 parent ee3f845
commit 7b97ce7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/include/NZSL/Lang/ErrorList.hpp b/include/NZSL/Lang/ErrorList.hpp
@@ -135,6 +135,7 @@ NZSL_SHADERLANG_COMPILER_ERROR(MissingWorkgroupAttribute, "compute shader requir
 NZSL_SHADERLANG_COMPILER_ERROR(ModuleCompilationFailed, "module {} compilation failed: {}", std::string, std::string)
 NZSL_SHADERLANG_COMPILER_ERROR(ModuleFeatureMismatch, "module {} requires feature {}", std::string, Ast::ModuleFeature)
 NZSL_SHADERLANG_COMPILER_ERROR(ModuleNotFound, "module {} not found", std::string)
+NZSL_SHADERLANG_COMPILER_ERROR(MultiplePushConstant, "there can be only one push constant external in a shader stage", std::string)
 NZSL_SHADERLANG_COMPILER_ERROR(NoModuleResolver, "import statement found but no module resolver has been set (and partial sanitization is not enabled)")
 NZSL_SHADERLANG_COMPILER_ERROR(OptionHashCollision, "option {} has the same hash as option {}", std::string, std::string)
 NZSL_SHADERLANG_COMPILER_ERROR(OptionDeclarationInsideFunction, "options must be declared outside of functions")

diff --git a/src/NZSL/Ast/SanitizeVisitor.cpp b/src/NZSL/Ast/SanitizeVisitor.cpp
@@ -197,16 +197,16 @@ namespace nzsl::Ast
 		static constexpr std::size_t ModuleIdSentinel =  std::numeric_limits<std::size_t>::max();
 
 		std::array<DeclareFunctionStatement*, ShaderStageTypeCount> entryFunctions = {};
-		std::vector<ModuleData> modules;
-		std::vector<NamedExternalBlockData> namedExternalBlocks;
-		std::vector<StatementPtr>* currentStatementList = nullptr;
+		std::shared_ptr<Environment> globalEnv;
+		std::shared_ptr<Environment> currentEnv;
+		std::shared_ptr<Environment> moduleEnv;
 		std::unordered_map<std::string, std::size_t> moduleByName;
 		std::unordered_map<std::uint64_t, UsedExternalData> usedBindingIndexes;
 		std::unordered_map<std::string, UsedExternalData> declaredExternalVar;
 		std::unordered_map<OptionHash, std::string> declaredOptions;
-		std::shared_ptr<Environment> globalEnv;
-		std::shared_ptr<Environment> currentEnv;
-		std::shared_ptr<Environment> moduleEnv;
+		std::vector<ModuleData> modules;
+		std::vector<NamedExternalBlockData> namedExternalBlocks;
+		std::vector<StatementPtr>* currentStatementList = nullptr;
 		IdentifierList<ConstantValue> constantValues;
 		IdentifierList<FunctionData> functions;
 		IdentifierList<Identifier> aliases;
@@ -218,6 +218,7 @@ namespace nzsl::Ast
 		IdentifierList<ExpressionType> variableTypes;
 		ModulePtr currentModule;
 		Options options;
+		SourceLocation pushConstantLocation;
 		FunctionData* currentFunction = nullptr;
 		bool allowUnknownIdentifiers = false;
 		bool inLoop = false;
@@ -1600,6 +1601,11 @@ NAZARA_WARNING_GCC_DISABLE("-Wmaybe-uninitialized")
 
 			if (IsPushConstantType(targetType))
 			{
+				if (m_context->pushConstantLocation.IsValid())
+					throw CompilerMultiplePushConstantError{ extVar.sourceLocation };
+
+				m_context->pushConstantLocation = extVar.sourceLocation;
+
 				if (extVar.bindingSet.HasValue())
 					throw CompilerUnexpectedAttributeOnPushConstantError{ extVar.sourceLocation, Ast::AttributeType::Set };
 				else if (extVar.bindingIndex.HasValue())

diff --git a/tests/src/Tests/ErrorsTests.cpp b/tests/src/Tests/ErrorsTests.cpp
@@ -417,6 +417,22 @@ external
 [nzsl_version("1.0")]
 module;
 
+struct Foo
+{
+}
+
+external
+{
+	foo: push_constant[Foo],
+	bar: push_constant[Foo]
+}
+
+)"), "(12,2 -> 24): CMultiplePushConstant error: there can be only one push constant external in a shader stage");
+
+			CHECK_THROWS_WITH(Compile(R"(
+[nzsl_version("1.0")]
+module;
+
 external
 {
 	[binding(0)] foo: i32