struct BlockModifier: Visitor
{
bool remove_node;
- std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
+ std::vector<RefPtr<ProgramSyntax::Node> > insert_nodes;
BlockModifier();
template<typename T>
struct NodeGatherer: Visitor
{
- typedef std::list<T *> ResultType;
+ typedef std::vector<T *> ResultType;
- std::list<T *> nodes;
+ std::vector<T *> nodes;
const ResultType &get_result() const { return nodes; }
using Visitor::visit;
virtual void visit(ProgramSyntax::Passthrough &);
};
- struct VariableRenamer: Visitor
- {
- using Visitor::visit;
- virtual void visit(ProgramSyntax::VariableReference &);
- virtual void visit(ProgramSyntax::VariableDeclaration &);
- };
-
struct DeclarationReorderer: Visitor
{
enum DeclarationKind
FUNCTION
};
+ unsigned scope_level;
DeclarationKind kind;
+ std::set<ProgramSyntax::Node *> ordered_funcs;
+ std::set<ProgramSyntax::Node *> needed_funcs;
DeclarationReorderer();
using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
+ virtual void visit(ProgramSyntax::FunctionCall &);
virtual void visit(ProgramSyntax::InterfaceLayout &) { kind = LAYOUT; }
virtual void visit(ProgramSyntax::StructDeclaration &) { kind = STRUCT; }
- virtual void visit(ProgramSyntax::VariableDeclaration &) { kind = VARIABLE; }
+ virtual void visit(ProgramSyntax::VariableDeclaration &);
virtual void visit(ProgramSyntax::InterfaceBlock &) { kind = VARIABLE; }
- virtual void visit(ProgramSyntax::FunctionDeclaration &) { kind = FUNCTION; }
+ virtual void visit(ProgramSyntax::FunctionDeclaration &);
};
struct InlineableFunctionLocator: Visitor
typedef std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Expression *> ValueMap;
const ValueMap *variable_values;
+ bool const_only;
float result;
bool result_valid;
ExpressionEvaluator();
- ExpressionEvaluator(const ValueMap &);
+ ExpressionEvaluator(const ValueMap *, bool);
using ProgramSyntax::NodeVisitor::visit;
virtual void visit(ProgramSyntax::Literal &);
struct ConstantConditionEliminator: BlockModifier
{
unsigned scope_level;
+ bool in_loop;
ExpressionEvaluator::ValueMap variable_values;
ConstantConditionEliminator();
bool supports_unified_sampling_functions() const;
virtual void visit(ProgramSyntax::FunctionCall &);
bool supports_interface_layouts() const;
+ bool supports_centroid_sampling() const;
+ bool supports_sample_sampling() const;
virtual void visit(ProgramSyntax::VariableDeclaration &);
bool supports_interface_blocks(const std::string &) const;
virtual void visit(ProgramSyntax::InterfaceBlock &);
};
Resources *resources;
- ProgramParser parser;
ProgramSyntax::Module *module;
+ std::set<std::string> imported_names;
public:
ProgramCompiler();
+ ~ProgramCompiler();
void compile(const std::string &, const std::string & = "<string>");
void compile(IO::Base &, Resources * = 0, const std::string & = "<file>");
static ProgramSyntax::Module *create_builtins_module();
static ProgramSyntax::Module &get_builtins_module();
static ProgramSyntax::Stage *get_builtins(ProgramSyntax::StageType);
+ void append_module(ProgramSyntax::Module &);
+ void append_stage(ProgramSyntax::Stage &);
void process();
void import(const std::string &);
void generate(ProgramSyntax::Stage &);