X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmodule.h;h=855d51957e8f9adb30a6e903d333186ebe5dbb25;hb=99ca354f18119f82f1adeca100cd665a8f640317;hp=5ea0149d2074e498e11e58ec97cfdd072b1ab642;hpb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;p=libs%2Fgl.git diff --git a/source/core/module.h b/source/core/module.h index 5ea0149d..855d5195 100644 --- a/source/core/module.h +++ b/source/core/module.h @@ -1,10 +1,12 @@ #ifndef MSP_GL_MODULE_H_ #define MSP_GL_MODULE_H_ +#include #include +#include #include #include "datatype.h" -#include "gl.h" +#include "module_backend.h" #include "glsl/compiler.h" #include "glsl/sourcemap.h" @@ -20,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: @@ -30,19 +40,32 @@ public: }; protected: - Module() { } + Module() = default; public: - virtual ~Module() { } + virtual ~Module() = default; 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; }; +/** +A shader module in GLSL source code format. +*/ class GlslModule: public Module { private: @@ -60,8 +83,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 { @@ -75,7 +109,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; @@ -85,46 +129,40 @@ public: struct EntryPoint { std::string name; - Stage stage; + Stage stage = VERTEX; std::vector globals; - - EntryPoint(); }; struct StructMember { std::string name; - DataType type; - const Structure *struct_type; - unsigned offset; - unsigned array_size; - const Constant *array_size_spec; - unsigned array_stride; - unsigned matrix_stride; - - StructMember(); + DataType type = VOID; + const Structure *struct_type = 0; + unsigned offset = 0; + unsigned array_size = 0; + unsigned array_stride = 0; + unsigned matrix_stride = 0; + BuiltinSemantic builtin = NOT_BUILTIN; }; struct Structure { std::string name; std::vector members; - unsigned size; + unsigned size = 0; }; struct Variable { std::string name; - StorageClass storage; - DataType type; - const Structure *struct_type; - const Constant *array_size_spec; - unsigned array_size; - int location; - int descriptor_set; - int binding; - - Variable(); + StorageClass storage = static_cast(-1); + DataType type = VOID; + const Structure *struct_type = 0; + unsigned array_size = 0; + int location = -1; + unsigned descriptor_set = 0; + int binding = -1; + BuiltinSemantic builtin = NOT_BUILTIN; bool operator==(const Variable &) const; }; @@ -132,26 +170,31 @@ public: struct Constant { std::string name; - int constant_id; - DataType type; + int constant_id = -1; + DataType type = VOID; union { - int i_value; + int i_value = 0; float f_value; }; }; + struct InstructionBlock + { + const Constant *condition = 0; + bool negate_condition = false; + std::vector accessed_variables; + std::vector successors; + }; + private: struct TypeInfo { - DataType type; - const Structure *struct_type; - const Constant *array_size_spec; - unsigned array_size; - unsigned array_stride; - StorageClass storage; - - TypeInfo(); + DataType type = VOID; + const Structure *struct_type = 0; + unsigned array_size = 0; + unsigned array_stride = 0; + StorageClass storage = static_cast(-1); }; struct Reflection @@ -164,6 +207,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 &); @@ -186,8 +233,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; @@ -195,17 +247,12 @@ private: std::vector structs; std::vector variables; std::vector spec_constants; - -public: - SpirVModule() { } - SpirVModule(const SpirVModule &); - SpirVModule &operator=(const SpirVModule &); -private: - void remap_pointers_from(const SpirVModule &); + std::vector blocks; 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 &); @@ -216,6 +263,7 @@ 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; } }; } // namespace GL