X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=b935ce14c3e88bf94636135cc5ae0fe084574cbf;hb=9e63512930bc7dace6dc169c65161961e5dcfcf6;hp=b6775202f61d1e696d55e97b15daa4309923816d;hpb=ebef7085e2672866189ccdb3a89e977e678a89b9;p=libs%2Fgl.git diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp index b6775202..b935ce14 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" @@ -28,7 +27,6 @@ Renderer::Renderer() shdata_stack.reserve(32); state = &state_stack.back(); add_shader_data(standard_shdata); - commands.use_pipeline(pipeline_state); } Renderer::~Renderer() @@ -88,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(); @@ -124,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; @@ -221,42 +212,24 @@ void Renderer::end() *state = State(); shdata_stack.clear(); add_shader_data(standard_shdata); - excluded.clear(); - - PipelineState::clear(); -} - -void Renderer::exclude(const Renderable &renderable) -{ - excluded.insert(&renderable); -} - -void Renderer::include(const Renderable &renderable) -{ - excluded.erase(&renderable); -} -void Renderer::render(const Renderable &renderable, Tag tag) -{ - if(!excluded.count(&renderable)) - renderable.render(*this, tag); + commands.use_pipeline(0); } -void Renderer::clear() -{ - clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT|STENCIL_BUFFER_BIT); -} - -void Renderer::clear(BufferBits buffers) +void Renderer::clear(const ClearValue *values) { pipeline_state.set_framebuffer(state->framebuffer); - commands.clear(buffers); + 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.refresh(); + commands.use_pipeline(&pipeline_state); commands.draw(batch); } @@ -264,10 +237,11 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count) { apply_state(); batch.refresh(); + commands.use_pipeline(&pipeline_state); commands.draw_instanced(batch, count); } -void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers) +void Renderer::resolve_multisample(Framebuffer &target) { if(!state->framebuffer) throw invalid_operation("Renderer::resolve_multisample"); @@ -277,8 +251,19 @@ void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers) if(target.get_width()!=width || target.get_height()!=height) throw incompatible_data("Renderer::resolve_multisample"); - apply_state(); - commands.resolve_multisample(target, buffers); + 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() @@ -313,20 +298,21 @@ 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) - { - int unit = (i->tag.id ? state->shprog->get_uniform_binding(i->tag) : i->unit); - if(unit>=0) - pipeline_state.set_texture(unit, i->texture, i->sampler); - } + for(const BoundTexture &t: texture_stack) + if(t.texture && t.replaced<0) + { + if(t.binding<0 || shprog_changed) + t.binding = state->shprog->get_uniform_binding(t.tag); + if(t.binding>=0) + pipeline_state.set_texture(t.binding, 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); @@ -334,10 +320,10 @@ 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; } @@ -348,36 +334,8 @@ void Renderer::apply_state() } -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), - framebuffer(0), - viewport(0), - scissor(0), - texture_count(0), - clipping(0), - shprog(0), - shdata_count(0), - vertex_setup(0), - front_face(NON_MANIFOLD), - face_cull(NO_CULL), - depth_test(0), - stencil_test(0), - blend(0), - object_lod_bias(0) + shdata(d) { } } // namespace GL