X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=41734fe85fdb6d170765353653038a6df9183f43;hb=9813f8711628a0fbe786406e974dc33546dc9cee;hp=8d96cc4270b5b1566f75e37f26e1e35fa04c0352;hpb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;p=libs%2Fgl.git diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index 8d96cc42..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) @@ -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;