};
private:
- struct BoundTexture
+ struct SampledTexture
{
- Tag tag;
- mutable int binding = -1;
const Texture *texture = 0;
const Sampler *sampler = 0;
int level = -1;
+
+ SampledTexture() = default;
+ SampledTexture(const Texture *t, const Sampler *s, int l): texture(t), sampler(s), level(l) { }
+
+ bool operator==(const SampledTexture &o) const { return texture==o.texture && sampler==o.sampler && level==o.level; }
+ };
+
+ template<typename T>
+ struct BoundResource
+ {
+ Tag tag;
+ mutable int binding = -1;
int replaced = -1;
+ T resource;
};
struct BoundProgramData
State *current_state = 0;
ProgramData standard_shdata;
std::vector<BoundProgramData> shdata_stack;
- std::vector<BoundTexture> texture_stack;
+ std::vector<BoundResource<SampledTexture>> texture_stack;
const Texture &placeholder_texture;
+ const Sampler &default_sampler;
PipelineState *last_pipeline = 0;
Commands commands;
+ static const Tag world_obj_matrix_tag;
+ static const Tag world_obj_normal_matrix_tag;
+
public:
Renderer();
void push_state();
/** Restores a previously saved state. Must be matched with an earlier
- push_state call. */
+ push_state() call. */
void pop_state();
private:
void set_texture(Tag, const Texture *, const Sampler * = 0);
void set_texture(Tag, const Texture *, int, const Sampler * = 0);
+ void set_storage_texture(Tag, const Texture *);
private:
+ template<typename T>
+ static void set_resource(std::vector<BoundResource<T>> &, unsigned &, Tag, const T &);
+
void flush_shader_data();
- void flush_textures();
+
+ template<typename T>
+ static void flush_resources(std::vector<BoundResource<T>> &, unsigned &);
public:
void set_vertex_setup(const VertexSetup *);
/** Draws a batch of primitives. A shader must be active. */
void draw(const Batch &);
- /** Draws multiple instances of a batch of primitives. A shader must be active. */
+ /** Draws multiple instances of a batch of primitives. A shader must be
+ active. */
void draw_instanced(const Batch &, unsigned);
+private:
+ void apply_batch(const Batch &);
+
+public:
+ /** Dispatches a compute operation. */
+ void dispatch(unsigned, unsigned = 1, unsigned = 1);
+
/** Resolves multisample attachments from the active framebuffer into
- target. */
- void resolve_multisample(Framebuffer &target);
+ their corresponding resolve attachments. */
+ void resolve_multisample();
void begin_query(const QueryPool &, unsigned);
void end_query(const QueryPool &, unsigned);