throw invalid_shader_source(get_diagnostics());
unsigned n = 0;
- for(list<Stage>::iterator i=module->stages.begin(); (i!=module->stages.end() && n<10000); ++n)
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++n)
{
OptimizeResult result = optimize(*i);
if(result==REDO_PREVIOUS)
target = &*i;
}
- if(target->content.body.empty())
- {
- Stage *builtins = get_builtins(stage.type);
- if(builtins && builtins!=&stage)
- append_stage(*builtins);
- }
-
if(stage.required_features.glsl_version>target->required_features.glsl_version)
target->required_features.glsl_version = stage.required_features.glsl_version;
for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
stage.required_features.gl_api = features.gl_api;
if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
stage.required_features.glsl_version = module->shared.required_features.glsl_version;
+
inject_block(stage.content, module->shared.content);
+ if(const Stage *builtins = get_builtins(stage.type))
+ inject_block(stage.content, builtins->content);
+ if(const Stage *builtins = get_builtins(Stage::SHARED))
+ inject_block(stage.content, builtins->content);
// Initial resolving pass
BlockHierarchyResolver().apply(stage);
- FunctionResolver().apply(stage);
- VariableResolver().apply(stage);
+ resolve(stage);
/* All variables local to a stage have been resolved. Resolve non-local
variables through interfaces. */
InterfaceGenerator().apply(stage);
- VariableResolver().apply(stage);
+ resolve(stage);
FunctionResolver().apply(stage);
ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
LegacyConverter().apply(stage, features);
}
+void Compiler::resolve(Stage &stage)
+{
+ TypeResolver().apply(stage);
+ // Use the bitwise or to always evaluate both operands
+ while(VariableResolver().apply(stage) |
+ ExpressionResolver().apply(stage)) ;
+ FunctionResolver().apply(stage);
+}
+
bool Compiler::validate(Stage &stage)
{
+ TypeValidator().apply(stage);
DeclarationValidator().apply(stage);
+ ReferenceValidator().apply(stage);
+ ExpressionValidator().apply(stage);
for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
if(i->severity==Diagnostic::ERR)
bool any_inlined = FunctionInliner().apply(stage);
any_inlined |= ExpressionInliner().apply(stage);
if(any_inlined)
- {
- VariableResolver().apply(stage);
- FunctionResolver().apply(stage);
- }
+ resolve(stage);
/* Removing variables or functions may cause things from the previous stage
to become unused. */
bool any_removed = UnusedVariableRemover().apply(stage);
any_removed |= UnusedFunctionRemover().apply(stage);
+ any_removed |= UnusedTypeRemover().apply(stage);
return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
}