X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=6bbfbbe0d0785628b89d1ec7c84608b2f0905b93;hb=8d211effd0c6db66e57f9ffd8ee712eef6069a1c;hp=d3124f0da334c7439e630266db0eef7c8c4654cf;hpb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;p=libs%2Fgl.git diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp index d3124f0d..6bbfbbe0 100644 --- a/source/render/renderer.cpp +++ b/source/render/renderer.cpp @@ -10,6 +10,7 @@ #include "renderable.h" #include "renderer.h" #include "resourcemanager.h" +#include "resources.h" #include "sampler.h" #include "texture.h" #include "vertexarray.h" @@ -20,7 +21,11 @@ using namespace std; namespace Msp { namespace GL { -Renderer::Renderer() +const Tag Renderer::world_obj_matrix_tag("world_obj_matrix"); +const Tag Renderer::world_obj_normal_matrix_tag("world_obj_normal_matrix"); + +Renderer::Renderer(): + placeholder_texture(Resources::get_global().get("_placeholder.png")) { state_stack.reserve(16); shdata_stack.reserve(32); @@ -38,7 +43,6 @@ void Renderer::begin() RendererBackend::begin(); - add_shader_data(standard_shdata); commands.begin_frame(frame_index); } @@ -69,9 +73,14 @@ void Renderer::pop_state() if(state_stack.size()==1) throw stack_underflow("Renderer::pop_state"); + uintptr_t old_pipeline = current_state->pipeline_key; + state_stack.pop_back(); current_state = &state_stack.back(); changed |= MATRIX; + + if(current_state->pipeline_key!=old_pipeline) + changed |= PIPELINE_KEY; } Renderer::State &Renderer::get_state() const @@ -83,10 +92,19 @@ Renderer::State &Renderer::get_state() const return *current_state; } +void Renderer::set_pipeline_key(uintptr_t key) +{ + State &state = get_state(); + if(key!=state.pipeline_key) + { + state.pipeline_key = key; + changed |= PIPELINE_KEY; + } +} + void Renderer::set_camera(const Camera &c) { get_state().camera = &c; - add_shader_data(c.get_shader_data()); set_matrix(Matrix()); } @@ -148,8 +166,12 @@ void Renderer::set_texture(Tag tag, const Texture *tex, int level, const Sampler State &state = get_state(); if(tex) + { if(ResourceManager *res_mgr = tex->get_manager()) res_mgr->resource_used(*tex); + if(!tex->is_loaded()) + tex = &placeholder_texture; + } if(texture_stack.size()>state.texture_count) { @@ -235,12 +257,8 @@ void Renderer::set_object_lod_bias(unsigned b) void Renderer::clear(const ClearValue *values) { - const State &state = get_state(); - - pipeline_state.set_framebuffer(state.framebuffer); - pipeline_state.set_viewport(state.viewport); - pipeline_state.set_scissor(state.scissor); - commands.use_pipeline(&pipeline_state); + apply_framebuffer(); + commands.use_pipeline(&get_pipeline_state()); commands.clear(values); } @@ -248,8 +266,9 @@ void Renderer::draw(const Batch &batch) { apply_state(); batch.refresh(frame_index); - pipeline_state.set_primitive_type(batch.get_type()); - commands.use_pipeline(&pipeline_state); + PipelineState &ps = get_pipeline_state(); + ps.set_primitive_type(batch.get_type()); + commands.use_pipeline(&ps); commands.draw(batch); } @@ -257,8 +276,9 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count) { apply_state(); batch.refresh(frame_index); - pipeline_state.set_primitive_type(batch.get_type()); - commands.use_pipeline(&pipeline_state); + PipelineState &ps = get_pipeline_state(); + ps.set_primitive_type(batch.get_type()); + commands.use_pipeline(&ps); commands.draw_instanced(batch, count); } @@ -274,8 +294,8 @@ void Renderer::resolve_multisample(Framebuffer &target) 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); + apply_framebuffer(); + commands.use_pipeline(&get_pipeline_state()); commands.resolve_multisample(target); } @@ -289,6 +309,29 @@ void Renderer::end_query(const QueryPool &pool, unsigned index) commands.end_query(pool, index); } +PipelineState &Renderer::get_pipeline_state() +{ + if(changed&PIPELINE_KEY) + { + RendererBackend::set_pipeline_key(current_state->pipeline_key); + changed &= ~PIPELINE_KEY; + } + + return RendererBackend::get_pipeline_state(); +} + +void Renderer::apply_framebuffer() +{ + const State &state = get_state(); + + PipelineState &ps = get_pipeline_state(); + + ps.set_framebuffer(state.framebuffer); + static const Rect default_rect = Rect::max(); + ps.set_viewport(state.viewport ? *state.viewport : default_rect); + ps.set_scissor(state.scissor ? *state.scissor : default_rect); +} + void Renderer::apply_state() { const State &state = get_state(); @@ -296,34 +339,46 @@ void Renderer::apply_state() if(!state.shprog) throw invalid_operation("Renderer::apply_state"); - pipeline_state.set_framebuffer(state.framebuffer); - pipeline_state.set_viewport(state.viewport); - pipeline_state.set_scissor(state.scissor); + apply_framebuffer(); - bool shprog_changed = (state.shprog!=pipeline_state.get_shader_program()); - pipeline_state.set_shader_program(state.shprog); + PipelineState &ps = get_pipeline_state(); + bool pipeline_changed = (&ps!=last_pipeline); + last_pipeline = &ps; - if(changed&MATRIX) - { - standard_shdata.uniform("world_obj_matrix", state.model_matrix); - LinAl::SquareMatrix nm = state.model_matrix.block<3, 3>(0, 0); - nm = transpose(invert(nm)); - standard_shdata.uniform("world_obj_normal_matrix", nm); - changed &= ~MATRIX; - } + bool shprog_changed = (state.shprog!=ps.get_shader_program()); + ps.set_shader_program(state.shprog); bool shdata_changed = changed&SHADER_DATA; 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); - if(shdata_changed || shprog_changed || extra_shdata) + if(changed&CAMERA) + { + shdata_changed = true; + changed &= ~CAMERA; + } + + if(changed&MATRIX) + { + standard_shdata.uniform(world_obj_matrix_tag, state.model_matrix); + LinAl::Matrix nm = state.model_matrix.block<3, 3>(0, 0); + nm = transpose(invert(nm)); + standard_shdata.uniform(world_obj_normal_matrix_tag, nm); + changed &= ~MATRIX; + shdata_changed = true; + } + + if(shdata_changed || shprog_changed || pipeline_changed || extra_shdata) { if(extra_shdata) shdata_stack.erase(shdata_stack.begin()+state.shdata_count, shdata_stack.end()); + standard_shdata.apply(*state.shprog, ps, frame_index); + if(state.camera) + state.camera->get_shader_data().apply(*state.shprog, ps, frame_index); for(const BoundProgramData &d: shdata_stack) { - d.shdata->apply(*state.shprog, pipeline_state, frame_index); + d.shdata->apply(*state.shprog, ps, frame_index); d.generation = d.shdata->get_generation(); } changed &= ~SHADER_DATA; @@ -336,10 +391,10 @@ void Renderer::apply_state() if(const VertexArray *array = state.vertex_setup->get_instance_array()) array->refresh(frame_index); } - pipeline_state.set_vertex_setup(state.vertex_setup); + ps.set_vertex_setup(state.vertex_setup); - pipeline_state.set_front_face(state.front_face); - pipeline_state.set_face_cull(state.face_cull); + ps.set_front_face(state.front_face); + ps.set_face_cull(state.face_cull); if(state.texture_countget_uniform_binding(t.tag); if(t.binding>=0) - pipeline_state.set_texture(t.binding, t.texture, t.level, t.sampler); + ps.set_texture(t.binding, t.texture, t.level, t.sampler); } - pipeline_state.set_depth_test(state.depth_test); - pipeline_state.set_stencil_test(state.stencil_test); - pipeline_state.set_blend(state.blend); + static const DepthTest default_depth_test; + ps.set_depth_test(state.depth_test ? *state.depth_test : default_depth_test); + static const StencilTest default_stencil_test; + ps.set_stencil_test(state.stencil_test ? *state.stencil_test : default_stencil_test); + static const Blend default_blend; + ps.set_blend(state.blend ? *state.blend : default_blend); }