Adjust GLSL features factory function names

Make it clear these functions deal with OpenGL versions.

diff --git a/source/glsl/features.cpp b/source/glsl/features.cpp
index 943f3b06fb8080b04defa5f807219b32ab404f4c..eff7dd8d7e1869547e70d04627607c91004db8bf 100644 (file)
--- a/source/glsl/features.cpp
+++ b/source/glsl/features.cpp
@@ -4,7 +4,7 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Features Features::from_version(const Version &ver)
+Features Features::from_opengl_version(const Version &ver)
 {
        Features features;
        features.target_api = OPENGL;
@@ -24,9 +24,9 @@ Features Features::from_version(const Version &ver)
        return features;
 }
 
-Features Features::latest()
+Features Features::opengl_latest()
 {
-       return from_version(Version(4, 60));
+       return from_opengl_version(Version(4, 60));
 }
 
 } // namespace SL

diff --git a/source/glsl/features.h b/source/glsl/features.h
index 14cc2b3743ed61cae347c62d90470f3fac9ad3c4..b72aa3d99d7ad619e7e42a8dfee8fe25ead87764 100644 (file)
--- a/source/glsl/features.h
+++ b/source/glsl/features.h
@@ -23,8 +23,8 @@ struct Features
        unsigned uniform_binding_range = 84;
        unsigned texture_binding_range = 96;
 
-       static Features from_version(const Version &);
-       static Features latest();
+       static Features from_opengl_version(const Version &);
+       static Features opengl_latest();
 };
 
 } // namespace SL

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index 458a56cee87caec21ef54dc42c5d0a5603a42583..5dfd520d903296a367aa45670cc6ecbef9a2ddf6 100644 (file)
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -28,7 +28,7 @@ using namespace std;
 using namespace Msp;
 
 GlslCompiler::GlslCompiler(int argc, char **argv):
-       features(GL::SL::Features::latest()),
+       features(GL::SL::Features::opengl_latest()),
        compile_mode(GL::SL::Compiler::PROGRAM),
        parse_only(false),
        combined(false),
@@ -54,7 +54,7 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
        getopt(argc, argv);
 
        if(target_version)
-               features = GL::SL::Features::from_version(GL::Version(target_version/100, target_version%100));
+               features = GL::SL::Features::from_opengl_version(GL::Version(target_version/100, target_version%100));
 
        if(as_module)
        {