X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tests%2Fglsl%2Fglslcompiler.cpp;h=3debd721fb8a769f3dd6837a1d65bc995b65bcc9;hb=d29b82596d6c21dd2b04fb2a24d3d3f3a1cc9b7b;hp=35bbc8bcfb82449e1261d8d1ce542df069b86833;hpb=de89f7b2511908024396d24255e9e604fd5f2435;p=libs%2Fgl.git

diff --git a/tests/glsl/glslcompiler.cpp b/tests/glsl/glslcompiler.cpp
index 35bbc8bc..3debd721 100644
--- a/tests/glsl/glslcompiler.cpp
+++ b/tests/glsl/glslcompiler.cpp
@@ -80,8 +80,8 @@ using namespace Msp;
 
 void GlslCompilerHelper::load_all_test_cases(const FS::Path &tests_dir)
 {
-	list<string> test_files = FS::list_filtered(tests_dir, "\\.glsl$");
-	test_files.sort();
+	vector<string> test_files = FS::list_filtered(tests_dir, "\\.glsl$");
+	sort(test_files);
 	for(const auto &fn: test_files)
 		load_test_case((tests_dir/fn).str());
 }
@@ -251,7 +251,7 @@ GlslCompilerTest::GlslCompilerTest()
 
 void GlslCompilerTest::run_test_case(const TestCase *test_case)
 {
-	GL::SL::Compiler compiler(GL::SL::Features::latest());
+	GL::SL::Compiler compiler(GL::SL::Features::opengl_latest());
 	try
 	{
 		compiler.set_source(test_case->source, "<test>");
@@ -308,13 +308,13 @@ GlslCompilerIdempotence::GlslCompilerIdempotence()
 
 void GlslCompilerIdempotence::run_test_case(const TestCase *test_case)
 {
-	GL::SL::Compiler compiler(GL::SL::Features::latest());
+	GL::SL::Compiler compiler(GL::SL::Features::opengl_latest());
 	compiler.set_source(test_case->source, "<test>");
 	if(test_case->compile_mode==GL::SL::Compiler::PROGRAM)
 		compiler.specialize(test_case->spec_values);
 	compiler.compile(test_case->compile_mode);
 
-	GL::SL::Compiler compiler2(GL::SL::Features::latest());
+	GL::SL::Compiler compiler2(GL::SL::Features::opengl_latest());
 	compiler2.set_source(compiler.get_combined_glsl(), "<loopback>");
 	compiler2.compile(test_case->compile_mode);
 
@@ -351,11 +351,11 @@ GlslCompilerSpirV::GlslCompilerSpirV():
 
 void GlslCompilerSpirV::run_test_case(const TestCase *test_case)
 {
-	GL::SL::Compiler compiler(GL::SL::Features::latest());
+	GL::SL::Compiler compiler(GL::SL::Features::opengl_latest());
 	compiler.set_source(test_case->source, "<test>");
 	compiler.compile(GL::SL::Compiler::SPIRV);
 
-	vector<UInt32> code = compiler.get_combined_spirv();
+	vector<uint32_t> code = compiler.get_combined_spirv();
 	if(!spirv_tools.Validate(code))
 		fail("Invalid SPIR-V generated");
 }