X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=ca5437f3a6970e6d626bf36520ebc828d0697ab1;hp=6f84cfd26436e314b6d48d02dac8e7c0e2b51154;hb=HEAD;hpb=7af200475facc657a0bbffaa17520d3ec9d809af diff --git a/source/core/program.h b/source/core/program.h index 6f84cfd2..3e206a70 100644 --- a/source/core/program.h +++ b/source/core/program.h @@ -1,26 +1,27 @@ #ifndef MSP_GL_PROGRAM_H_ #define MSP_GL_PROGRAM_H_ +#include #include #include #include -#include "bindable.h" -#include "datatype.h" -#include "gl.h" #include "module.h" -#include "vertexformat.h" +#include "program_backend.h" +#include "reflectdata.h" namespace Msp { namespace GL { -class Shader; - /** -A complete shader program. Programs can be assembled of individual Shaders or -generated with a set of standard features. +A shader program consisting of one or more stages. + +Programs are created from Modules. Specialization values can be applied to +customize behaviour of the module. */ -class Program: public Bindable +class Program: public ProgramBackend { + friend ProgramBackend; + public: class Loader: public DataFile::CollectionObjectLoader { @@ -28,13 +29,7 @@ public: Loader(Program &, Collection &); private: - virtual void finish(); - - void attribute(unsigned, const std::string &); - void fragment_shader(const std::string &); - void geometry_shader(const std::string &); void module(const std::string &); - void vertex_shader(const std::string &); }; private: @@ -55,114 +50,54 @@ private: void specialize_int(const std::string &, int); }; -public: - typedef unsigned LayoutHash; - struct UniformBlockInfo; - - struct UniformInfo - { - std::string name; - const UniformBlockInfo *block; - unsigned location; - unsigned array_size; - unsigned array_stride; - unsigned matrix_stride; - DataType type; - }; - - struct UniformBlockInfo - { - std::string name; - unsigned data_size; - int bind_point; - std::vector uniforms; - LayoutHash layout_hash; - }; - - struct AttributeInfo - { - std::string name; - unsigned location; - unsigned array_size; - DataType type; - }; - - typedef std::map UniformMap; - typedef std::map UniformBlockMap; - typedef std::map AttributeMap; - -private: - unsigned id; - std::vector stage_ids; - const Module *module; - bool linked; - UniformBlockMap uniform_blocks; - UniformMap uniforms; - LayoutHash uniform_layout_hash; - AttributeMap attributes; + ReflectData reflect_data; + SpirVModule *specialized_spirv = 0; public: /// Constructs an empty Program with no shader stages attached. - Program(); - - /// Constructs a Program from unified source code using ProgramCompiler. - DEPRECATED Program(const std::string &); - - /// Constructs a Program from vertex and fragment shader source code. - DEPRECATED Program(const std::string &, const std::string &); + Program() = default; /// Constructs a Program from a Module, with specialization constants. Program(const Module &, const std::map & = std::map()); -private: - void init(); -public: - virtual ~Program(); + Program(Program &&); + ~Program(); void add_stages(const Module &, const std::map & = std::map()); private: - unsigned add_stage(GLenum); - void add_glsl_stages(const GlslModule &, const std::map &); - void compile_glsl_stage(unsigned); - void add_spirv_stages(const SpirVModule &, const std::map &); + void collect_uniforms(const SpirVModule &); + void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector &); + void collect_attributes(const SpirVModule &); + void collect_builtins(const SpirVModule &); + void collect_builtins(const SpirVModule::Structure &); public: - DEPRECATED void attach_shader(Shader &shader); - DEPRECATED void attach_shader_owned(Shader *shader); - DEPRECATED void detach_shader(Shader &shader); - DEPRECATED const std::vector &get_attached_shaders() const; - - DEPRECATED void bind_attribute(unsigned, const std::string &); - DEPRECATED void bind_attribute(VertexAttribute, const std::string &); - DEPRECATED void bind_fragment_data(unsigned, const std::string &); - - void link(); + using ProgramBackend::is_compute; + using ProgramBackend::has_tessellation; + + ReflectData::LayoutHash get_uniform_layout_hash() const { return reflect_data.layout_hash; } + unsigned get_n_descriptor_sets() const { return reflect_data.n_descriptor_sets; } + unsigned get_push_constants_size() const { return reflect_data.push_constants_size; } + const std::vector &get_uniform_blocks() const { return reflect_data.uniform_blocks; } + const ReflectData::UniformBlockInfo &get_uniform_block_info(const std::string &) const; + const std::vector &get_uniforms() const { return reflect_data.uniforms; } + const ReflectData::UniformInfo &get_uniform_info(const std::string &) const; + const ReflectData::UniformInfo &get_uniform_info(Tag) const; + int get_uniform_location(const std::string &) const; + int get_uniform_location(Tag) const; + int get_uniform_binding(Tag) const; + bool uses_uniform_block_binding(int b) const { return uses_binding(b|ReflectData::UNIFORM_BLOCK_BINDING); } + bool uses_texture_binding(unsigned b) const { return uses_binding(b|ReflectData::TEXTURE_BINDING); } private: - void query_uniforms(); - void query_uniform_blocks(const std::vector &); - void query_attributes(); - void collect_uniforms(); - void collect_block_uniforms(UniformBlockInfo &, const SpirVModule::Structure &, const std::string &, unsigned); - void collect_attributes(); - void update_layout_hash(); - static LayoutHash compute_layout_hash(const std::vector &); - static bool uniform_location_compare(const UniformInfo *, const UniformInfo *); + bool uses_binding(int) const; public: - bool is_linked() const { return linked; } - DEPRECATED std::string get_info_log() const; - - LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; } - const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; } - const UniformBlockInfo &get_uniform_block_info(const std::string &) const; - const UniformMap &get_uniforms() const { return uniforms; } - const UniformInfo &get_uniform_info(const std::string &) const; - int get_uniform_location(const std::string &) const; - const AttributeMap &get_attributes() const { return attributes; } - const AttributeInfo &get_attribute_info(const std::string &) const; + const std::vector &get_attributes() const { return reflect_data.attributes; } + const ReflectData::AttributeInfo &get_attribute_info(const std::string &) const; int get_attribute_location(const std::string &) const; + unsigned get_n_clip_distances() const { return reflect_data.n_clip_distances; } + const LinAl::Vector &get_compute_workgroup_size() const { return reflect_data.compute_wg_size; } - void bind() const; - static void unbind(); + using ProgramBackend::set_debug_name; }; } // namespace GL