From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 8 Nov 2021 20:18:38 +0000 (+0200)
Subject: Use specially created features when compiling modules from GLSL
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=26602194c7831bb81b42138c4ee1564be9878342;p=libs%2Fgl.git

Use specially created features when compiling modules from GLSL

Set the latest version so all language features are retained, but limit
bindings to what the implementation actually supports.
---

diff --git a/source/core/module.cpp b/source/core/module.cpp
index 099e8b7f..89d41894 100644
--- a/source/core/module.cpp
+++ b/source/core/module.cpp
@@ -50,14 +50,14 @@ namespace GL {
 
 void Module::set_source(const string &src)
 {
-	SL::Compiler compiler(DeviceInfo::get_global().glsl_features);
+	SL::Compiler compiler(create_features());
 	compiler.set_source(src);
 	compile(compiler);
 }
 
 void Module::load_source(IO::Base &io, Resources *res, const string &name)
 {
-	SL::Compiler compiler(DeviceInfo::get_global().glsl_features);
+	SL::Compiler compiler(create_features());
 	compiler.load_source(io, res, name);
 	compile(compiler);
 }
@@ -67,6 +67,19 @@ void Module::load_source(IO::Base &io, const string &name)
 	load_source(io, 0, name);
 }
 
+SL::Features Module::create_features() const
+{
+	const SL::Features &device_features = DeviceInfo::get_global().glsl_features;
+	SL::Features latest_features = SL::Features::latest(get_backend_api());
+	SL::Features features;
+	features.target_api = latest_features.target_api;
+	features.glsl_version = latest_features.glsl_version;
+	features.constant_id_range = device_features.constant_id_range;
+	features.uniform_binding_range = device_features.uniform_binding_range;
+	features.texture_binding_range = device_features.texture_binding_range;
+	return features;
+}
+
 
 void GlslModule::compile(SL::Compiler &compiler)
 {
diff --git a/source/core/module.h b/source/core/module.h
index a480b613..16e07053 100644
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -58,6 +58,8 @@ public:
 
 private:
 	virtual void compile(SL::Compiler &) = 0;
+
+	SL::Features create_features() const;
 };
 
 /**