X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=ad5f87d5a4fd6fd8add9613b7562cb4415de0156;hp=575b44a85ff4a56ed7351e0a8500a848ba8577c6;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=b466adff89db080c304ac3178ce1f4fef844cb28 diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp index 575b44a8..ad5f87d5 100644 --- a/source/render/renderer.cpp +++ b/source/render/renderer.cpp @@ -1,12 +1,9 @@ -#include -#include -#include #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" @@ -24,7 +21,8 @@ using namespace std; namespace Msp { namespace GL { -Renderer::Renderer() +Renderer::Renderer(): + changed(0) { state_stack.reserve(16); state_stack.push_back(State()); @@ -90,7 +88,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(); @@ -225,7 +223,7 @@ void Renderer::end() add_shader_data(standard_shdata); excluded.clear(); - PipelineState::clear(); + commands.use_pipeline(0); } void Renderer::exclude(const Renderable &renderable) @@ -244,33 +242,32 @@ void Renderer::render(const Renderable &renderable, Tag tag) renderable.render(*this, tag); } -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); - pipeline_state.apply(); - glClear(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.draw(); + batch.refresh(); + commands.use_pipeline(&pipeline_state); + commands.draw(batch); } void Renderer::draw_instanced(const Batch &batch, unsigned count) { apply_state(); - - batch.draw_instanced(count); + 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"); @@ -280,20 +277,19 @@ void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers) if(target.get_width()!=width || target.get_height()!=height) throw incompatible_data("Renderer::resolve_multisample"); - if(ARB_direct_state_access) - glBlitNamedFramebuffer(state->framebuffer->get_id(), target.get_id(), 0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST); - else - { - glBindFramebuffer(GL_READ_FRAMEBUFFER, state->framebuffer->get_id()); - glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target.get_id()); - - target.refresh(); + pipeline_state.set_framebuffer(state->framebuffer); + commands.use_pipeline(&pipeline_state); + commands.resolve_multisample(target); +} - glBlitFramebuffer(0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST); +void Renderer::begin_query(const QueryPool &pool, unsigned index) +{ + commands.begin_query(pool, index); +} - glBindFramebuffer(GL_FRAMEBUFFER, 0); - pipeline_state.set_framebuffer(0); - } +void Renderer::end_query(const QueryPool &pool, unsigned index) +{ + commands.end_query(pool, index); } void Renderer::apply_state() @@ -333,15 +329,15 @@ void Renderer::apply_state() 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); @@ -349,10 +345,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; } @@ -360,41 +356,11 @@ void Renderer::apply_state() pipeline_state.set_depth_test(state->depth_test); pipeline_state.set_stencil_test(state->stencil_test); pipeline_state.set_blend(state->blend); - - pipeline_state.apply(); } -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