X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fglslcompiler.cpp;h=5dfd520d903296a367aa45670cc6ecbef9a2ddf6;hb=8751e01c31094455bbe72d23ac1bffd9a86c7c45;hp=4fe6bc8bd636d75e00cb3f76bd1ee0d6a9fc277e;hpb=cbe2ec1f080b117faf9bf0ad2d92d5d4f2379584;p=libs%2Fgl.git diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp index 4fe6bc8b..5dfd520d 100644 --- 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) { @@ -149,7 +149,7 @@ int GlslCompiler::main() if(compile_mode==GL::SL::Compiler::SPIRV) { - vector code = compiler.get_combined_spirv(); + vector code = compiler.get_combined_spirv(); out->write(reinterpret_cast(&code.front()), code.size()*4); } else if(combined)