#include <msp/datafile/objectloader.h>
#include "bindable.h"
#include "gl.h"
+#include "programbuilder.h"
+#include "vertexformat.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.
+*/
class Program: public Bindable<Program>
{
public:
void vertex_shader(const std::string &);
};
- struct StandardFeatures
- {
- class Loader: public DataFile::ObjectLoader<StandardFeatures>
- {
- public:
- Loader(StandardFeatures &);
- };
-
- bool texture;
- bool material;
- bool lighting;
- bool specular;
- bool normalmap;
- bool shadow;
- bool reflection;
- bool transform;
-
- StandardFeatures();
-
- std::string create_flags() const;
- };
+ typedef unsigned LayoutHash;
+ struct UniformBlockInfo;
struct UniformInfo
{
std::string name;
+ const UniformBlockInfo *block;
unsigned location;
unsigned size;
unsigned array_stride;
{
std::string name;
unsigned data_size;
- unsigned bind_point;
+ int bind_point;
std::vector<const UniformInfo *> uniforms;
- unsigned layout_hash;
+ LayoutHash layout_hash;
};
typedef std::list<Shader *> ShaderList;
bool linked;
UniformBlockMap uniform_blocks;
UniformMap uniforms;
- unsigned uniform_layout_hash;
+ LayoutHash uniform_layout_hash;
+ bool legacy_vars;
public:
+ /// Constructs an empty Program with no Shaders attached.
Program();
- Program(const StandardFeatures &);
+
+ /// Constructs a Program with standard features.
+ Program(const ProgramBuilder::StandardFeatures &);
+
+ /// Constructs a Program from vertex and fragment shader source code.
Program(const std::string &, const std::string &);
+
private:
void init();
public:
void attach_shader(Shader &shader);
void attach_shader_owned(Shader *shader);
void detach_shader(Shader &shader);
- void add_standard_shaders(const StandardFeatures &);
-private:
- static std::string process_standard_source(const char **, const std::string &);
-public:
const ShaderList &get_shaders() const { return shaders; }
void bind_attribute(unsigned, const std::string &);
+ void bind_attribute(VertexComponent, const std::string &);
+ void bind_fragment_data(unsigned, const std::string &);
void link();
private:
- static unsigned compute_layout_hash(const std::vector<const UniformInfo *> &);
+ static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
+ static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
public:
bool is_linked() const { return linked; }
std::string get_info_log() const;
- unsigned get_uniform_layout_hash() const { return uniform_layout_hash; }
+ 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;
+ bool uses_legacy_variables() const { return legacy_vars; }
+
void bind() const;
static void unbind();
};