X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fmodule.h;h=26895ee0ba2fe9355e397026b5a068c3f7985fe4;hp=7713d3ce0a77a79af54b61298868a31b24c77d1a;hb=e1be82a4dfce8d90358c506f65be09da4dc9d5ec;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14 diff --git a/source/core/module.h b/source/core/module.h index 7713d3ce..26895ee0 100644 --- a/source/core/module.h +++ b/source/core/module.h @@ -6,6 +6,7 @@ #include #include #include "datatype.h" +#include "module_backend.h" #include "glsl/compiler.h" #include "glsl/sourcemap.h" @@ -21,6 +22,14 @@ public: class Resources; +/** +Base class for shader modules. Internal representation depends on the +concrete type. + +Modules can be loaded from files. + +Applications normally use the Program class to access shaders. +*/ class Module { public: @@ -37,13 +46,29 @@ public: virtual Format get_format() const = 0; + /** Sets the module's content from GLSL source code. */ void set_source(const std::string &); - void load_source(IO::Base &, Resources *, const std::string &); + + /** Loads GLSL source from a file or other I/O object. Any import + statements are resolved using res. */ + void load_source(IO::Base &, Resources *res, const std::string &name); + + /** Loads GLSL source from a file or other I/O object. Only builtin + shader fragments can be imported. */ void load_source(IO::Base &, const std::string &); + private: virtual void compile(SL::Compiler &) = 0; + + SL::Features create_features() const; + +public: + virtual void set_debug_name(const std::string &) { } }; +/** +A shader module in GLSL source code format. +*/ class GlslModule: public Module { private: @@ -61,8 +86,19 @@ public: const SL::SourceMap &get_source_map() const { return source_map; } }; -class SpirVModule: public Module +/** +A shader module in SPIR-V binary format. + +When the module's contents are set from GLSL source, it will be automatically +compiled to SPIR-V. Pre-compiled SPIR-V modules can also be loaded. + +Afterwards reflection data is available, providing information about variables +forming the module's interface. +*/ +class SpirVModule: public Module, public SpirVModuleBackend { + friend SpirVModuleBackend; + public: enum Stage { @@ -76,7 +112,17 @@ public: UNIFORM_CONSTANT = 0, INPUT = 1, UNIFORM = 2, - OUTPUT = 3 + OUTPUT = 3, + PUSH_CONSTANT = 9 + }; + + enum BuiltinSemantic + { + NOT_BUILTIN = -1, + POSITION = 0, + CLIP_DISTANCE = 3, + LAYER = 9, + FRAG_DEPTH = 22 }; struct Constant; @@ -86,6 +132,7 @@ public: struct EntryPoint { std::string name; + unsigned id = 0; Stage stage = VERTEX; std::vector globals; }; @@ -97,29 +144,31 @@ public: const Structure *struct_type = 0; unsigned offset = 0; unsigned array_size = 0; - const Constant *array_size_spec = 0; unsigned array_stride = 0; unsigned matrix_stride = 0; + BuiltinSemantic builtin = NOT_BUILTIN; }; struct Structure { std::string name; - std::vector members; + unsigned id = 0; unsigned size = 0; + std::vector members; }; struct Variable { std::string name; - StorageClass storage = static_cast(-1); + unsigned id = 0; DataType type = VOID; const Structure *struct_type = 0; - const Constant *array_size_spec = 0; + StorageClass storage = static_cast(-1); unsigned array_size = 0; int location = -1; - int descriptor_set = -1; + unsigned descriptor_set = 0; int binding = -1; + BuiltinSemantic builtin = NOT_BUILTIN; bool operator==(const Variable &) const; }; @@ -127,6 +176,7 @@ public: struct Constant { std::string name; + unsigned id = 0; int constant_id = -1; DataType type = VOID; union @@ -136,12 +186,20 @@ public: }; }; + struct InstructionBlock + { + unsigned id = 0; + bool negate_condition = false; + const Constant *condition = 0; + std::vector accessed_variables; + std::vector successors; + }; + private: struct TypeInfo { DataType type = VOID; const Structure *struct_type = 0; - const Constant *array_size_spec = 0; unsigned array_size = 0; unsigned array_stride = 0; StorageClass storage = static_cast(-1); @@ -157,6 +215,10 @@ private: std::map entry_points; std::map structs; std::map variables; + std::map blocks; + std::map access_chain_bases; + Constant true_condition; + InstructionBlock *current_block = 0; static std::uint32_t get_opcode(std::uint32_t); static CodeIterator get_op_end(const CodeIterator &); @@ -179,8 +241,13 @@ private: void reflect_pointer_type(CodeIterator); void reflect_constant(CodeIterator); void reflect_variable(CodeIterator); + void reflect_access(CodeIterator); + void reflect_access_chain(CodeIterator); void reflect_decorate(CodeIterator); void reflect_member_decorate(CodeIterator); + void reflect_label(CodeIterator); + void reflect_branch(CodeIterator); + void reflect_branch_conditional(CodeIterator); }; std::vector code; @@ -188,17 +255,13 @@ private: std::vector structs; std::vector variables; std::vector spec_constants; - -public: - SpirVModule() = default; - SpirVModule(const SpirVModule &); - SpirVModule &operator=(const SpirVModule &); -private: - void remap_pointers_from(const SpirVModule &); + std::vector blocks; + bool specializable = false; public: virtual Format get_format() const { return SPIR_V; } + /** Loads a SPIR-V binary from a file or other I/O object. */ void load_code(IO::Base &); private: virtual void compile(SL::Compiler &); @@ -209,6 +272,18 @@ public: const std::vector &get_entry_points() const { return entry_points; } const std::vector &get_variables() const { return variables; } const std::vector &get_spec_constants() const { return spec_constants; } + const std::vector &get_blocks() const { return blocks; } + bool is_specializable() const { return specializable; } + + /** Creates a new module which is a specialized version of this one. */ + SpirVModule *specialize(const std::map &) const; + +private: + std::vector collect_visited_blocks(const std::map &) const; + void collect_visited_blocks(unsigned, std::vector &) const; + +public: + void set_debug_name(const std::string &n) { SpirVModuleBackend::set_debug_name(n); } }; } // namespace GL