X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=41734fe85fdb6d170765353653038a6df9183f43;hb=c39bb707ff8678d0675538994dc05182e61da193;hp=4f2080ab9c59afb8c8b6018aed6cac2d60c40d09;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 4f2080ab..41734fe8 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -4,6 +4,7 @@
 #include "builtin.h"
 #include "compiler.h"
 #include "debug.h"
+#include "deviceinfo.h"
 #include "error.h"
 #include "finalize.h"
 #include "generate.h"
@@ -24,7 +25,7 @@ namespace GL {
 namespace SL {
 
 Compiler::Compiler():
-	features(Features::from_context()),
+	features(DeviceInfo::get_global().glsl_features),
 	module(0),
 	compiled(false),
 	specialized(false)
@@ -157,7 +158,7 @@ string Compiler::get_stage_glsl(Stage::Type stage_type) const
 	throw key_error(Stage::get_stage_name(stage_type));
 }
 
-vector<UInt32> Compiler::get_combined_spirv() const
+vector<uint32_t> Compiler::get_combined_spirv() const
 {
 	if(!compiled)
 		throw invalid_operation("Compiler::get_combined_spirv");
@@ -278,7 +279,7 @@ void Compiler::import(ModuleCache &mod_cache, const string &name)
 
 void Compiler::generate(Stage &stage)
 {
-	stage.required_features.gl_api = features.gl_api;
+	stage.required_features.target_api = features.target_api;
 	if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
 		stage.required_features.glsl_version = module->shared.required_features.glsl_version;