From 4484729cf5f3eda00ed4d814d16ad1bd50427726 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Fri, 7 Oct 2022 21:22:20 +0300 Subject: [PATCH] Rename frame_index in Renderer to frame_number It's a free-running counter, not used directly as an index. --- source/render/renderer.cpp | 16 ++++++++-------- source/render/renderer.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp index 7e010b3f..b74b0773 100644 --- a/source/render/renderer.cpp +++ b/source/render/renderer.cpp @@ -38,13 +38,13 @@ void Renderer::begin() if(current_state) throw invalid_operation("Renderer::begin"); - ++frame_index; + ++frame_number; state_stack.emplace_back(); current_state = &state_stack.back(); RendererBackend::begin(); - commands.begin_frame(frame_index); + commands.begin_frame(frame_number); } void Renderer::end() @@ -292,7 +292,7 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count) void Renderer::apply_batch(const Batch &batch) { - batch.refresh(frame_index); + batch.refresh(frame_number); PipelineState &ps = get_pipeline_state(); ps.set_primitive_type(batch.get_type()); if(batch.get_type()==PATCHES) @@ -394,12 +394,12 @@ void Renderer::apply_state() { if(extra_shdata) shdata_stack.erase(shdata_stack.begin()+state.shdata_count, shdata_stack.end()); - standard_shdata.apply(*state.shprog, ps, frame_index); + standard_shdata.apply(*state.shprog, ps, frame_number); if(state.camera) - state.camera->get_shader_data().apply(*state.shprog, ps, frame_index); + state.camera->get_shader_data().apply(*state.shprog, ps, frame_number); for(const BoundProgramData &d: shdata_stack) { - d.shdata->apply(*state.shprog, ps, frame_index); + d.shdata->apply(*state.shprog, ps, frame_number); d.generation = d.shdata->get_generation(); } changed &= ~SHADER_DATA; @@ -408,9 +408,9 @@ void Renderer::apply_state() if(state.vertex_setup) { if(const VertexArray *array = state.vertex_setup->get_vertex_array()) - array->refresh(frame_index); + array->refresh(frame_number); if(const VertexArray *array = state.vertex_setup->get_instance_array()) - array->refresh(frame_index); + array->refresh(frame_number); } ps.set_vertex_setup(state.vertex_setup); diff --git a/source/render/renderer.h b/source/render/renderer.h index 0fa19346..2050c8c4 100644 --- a/source/render/renderer.h +++ b/source/render/renderer.h @@ -120,7 +120,7 @@ private: SHADER_DATA = 16 }; - unsigned frame_index = 0; + unsigned frame_number = 0; unsigned char changed = 0; std::vector state_stack; State *current_state = 0; -- 2.45.2