X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=447ab4e35de83faaad278b5df44e8861c7ea5d18;hb=8544116298d7a1be176f52be48c9952529f5c446;hp=29db99232cd48a8a9e946b12f9326d32fb0e23a8;hpb=fe9836f2d8d7abb0480582c544611a5b248310cc;p=libs%2Fgl.git diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp index 29db9923..447ab4e3 100644 --- a/source/render/renderer.cpp +++ b/source/render/renderer.cpp @@ -1,9 +1,8 @@ #include "batch.h" #include "buffer.h" #include "camera.h" -#include "clipping.h" -#include "deviceinfo.h" #include "error.h" +#include "framebuffer.h" #include "lighting.h" #include "material.h" #include "program.h" @@ -54,6 +53,21 @@ void Renderer::transform(const Matrix &matrix) changed |= MATRIX; } +void Renderer::set_framebuffer(const Framebuffer *f) +{ + state->framebuffer = f; +} + +void Renderer::set_viewport(const Rect *v) +{ + state->viewport = v; +} + +void Renderer::set_scissor(const Rect *s) +{ + state->scissor = s; +} + void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp) { if(tex) @@ -72,7 +86,7 @@ void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp) flush_textures(); } - for(vector::iterator i=texture_stack.end(); i!=texture_stack.begin(); ) + for(auto i=texture_stack.end(); i!=texture_stack.begin(); ) if((--i)->tag==tag) { i->replaced = texture_stack.size(); @@ -108,13 +122,6 @@ void Renderer::set_lighting(const Lighting *l) add_shader_data(l->get_shader_data()); } -void Renderer::set_clipping(const Clipping *c) -{ - state->clipping = c; - if(c) - add_shader_data(c->get_shader_data()); -} - void Renderer::set_shader_program(const Program *p, const ProgramData *d) { state->shprog = p; @@ -161,6 +168,21 @@ void Renderer::set_face_cull(CullMode cull) state->face_cull = cull; } +void Renderer::set_depth_test(const DepthTest *dt) +{ + state->depth_test = dt; +} + +void Renderer::set_stencil_test(const StencilTest *st) +{ + state->stencil_test = st; +} + +void Renderer::set_blend(const Blend *b) +{ + state->blend = b; +} + void Renderer::set_object_lod_bias(unsigned b) { state->object_lod_bias = b; @@ -192,7 +214,7 @@ void Renderer::end() add_shader_data(standard_shdata); excluded.clear(); - PipelineState::clear(); + commands.use_pipeline(0); } void Renderer::exclude(const Renderable &renderable) @@ -211,18 +233,54 @@ void Renderer::render(const Renderable &renderable, Tag tag) renderable.render(*this, tag); } +void Renderer::clear(const ClearValue *values) +{ + pipeline_state.set_framebuffer(state->framebuffer); + pipeline_state.set_viewport(state->viewport); + pipeline_state.set_scissor(state->scissor); + commands.use_pipeline(&pipeline_state); + commands.clear(values); +} + void Renderer::draw(const Batch &batch) { apply_state(); - - batch.draw(); + batch.refresh(); + commands.use_pipeline(&pipeline_state); + commands.draw(batch); } void Renderer::draw_instanced(const Batch &batch, unsigned count) { apply_state(); + batch.refresh(); + commands.use_pipeline(&pipeline_state); + commands.draw_instanced(batch, count); +} - batch.draw_instanced(count); +void Renderer::resolve_multisample(Framebuffer &target) +{ + if(!state->framebuffer) + throw invalid_operation("Renderer::resolve_multisample"); + + unsigned width = state->framebuffer->get_width(); + unsigned height = state->framebuffer->get_height(); + if(target.get_width()!=width || target.get_height()!=height) + throw incompatible_data("Renderer::resolve_multisample"); + + pipeline_state.set_framebuffer(state->framebuffer); + commands.use_pipeline(&pipeline_state); + commands.resolve_multisample(target); +} + +void Renderer::begin_query(const QueryPool &pool, unsigned index) +{ + commands.begin_query(pool, index); +} + +void Renderer::end_query(const QueryPool &pool, unsigned index) +{ + commands.end_query(pool, index); } void Renderer::apply_state() @@ -239,6 +297,10 @@ void Renderer::apply_state() changed &= ~MATRIX; } + pipeline_state.set_framebuffer(state->framebuffer); + pipeline_state.set_viewport(state->viewport); + pipeline_state.set_scissor(state->scissor); + bool shprog_changed = (state->shprog!=pipeline_state.get_shader_program()); pipeline_state.set_shader_program(state->shprog); @@ -253,20 +315,19 @@ void Renderer::apply_state() pipeline_state.set_front_face(state->front_face); pipeline_state.set_face_cull(state->face_cull); - pipeline_state.set_enabled_clip_planes(state->clipping ? (1<clipping->get_n_planes())-1 : 0); if(state->texture_count::const_iterator i=texture_stack.begin(); i!=texture_stack.end(); ++i) + for(const BoundTexture &t: texture_stack) { - int unit = (i->tag.id ? state->shprog->get_uniform_binding(i->tag) : i->unit); + int unit = (t.tag.id ? state->shprog->get_uniform_binding(t.tag) : t.unit); if(unit>=0) - pipeline_state.set_texture(unit, i->texture, i->sampler); + pipeline_state.set_texture(unit, t.texture, t.sampler); } bool shdata_changed = changed&SHADER_DATA; - for(vector::const_iterator i=shdata_stack.begin(); (!shdata_changed && i!=shdata_stack.end()); ++i) + for(auto i=shdata_stack.begin(); (!shdata_changed && i!=shdata_stack.end()); ++i) shdata_changed = (i->shdata->get_generation()!=i->generation); bool extra_shdata = (shdata_stack.size()>state->shdata_count); @@ -274,43 +335,22 @@ void Renderer::apply_state() { if(extra_shdata) shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end()); - for(vector::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i) + for(const BoundProgramData &d: shdata_stack) { - i->shdata->apply(*state->shprog, pipeline_state); - i->generation = i->shdata->get_generation(); + d.shdata->apply(*state->shprog, pipeline_state); + d.generation = d.shdata->get_generation(); } changed &= ~SHADER_DATA; } - pipeline_state.apply(); + pipeline_state.set_depth_test(state->depth_test); + pipeline_state.set_stencil_test(state->stencil_test); + pipeline_state.set_blend(state->blend); } -Renderer::BoundTexture::BoundTexture(): - unit(-1), - texture(0), - sampler(0), - replaced(-1) -{ } - - Renderer::BoundProgramData::BoundProgramData(const ProgramData *d): - shdata(d), - generation(0) -{ } - - -Renderer::State::State(): - camera(0), - texture_count(0), - lowest_effect_texunit(Limits::get_global().max_texture_bindings), - clipping(0), - shprog(0), - shdata_count(0), - vertex_setup(0), - front_face(NON_MANIFOLD), - face_cull(NO_CULL), - object_lod_bias(0) + shdata(d) { } } // namespace GL