mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(shader_gl_core.cpp) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-01-22 13:52:14 +01:00
parent 376ad6d61d
commit 8f1aa8c2c3
1 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
gfx/drivers_shader/shader_gl_core.cpp
View File

@ -1096,8 +1096,7 @@ Size2D Pass::get_output_size(const Size2D &original, const Size2D &source) const
void Pass::end_frame() void Pass::end_frame()
{ {
if (framebuffer_feedback) swap(framebuffer, framebuffer_feedback);
swap(framebuffer, framebuffer_feedback);
} }
void Pass::build_semantic_vec4(uint8_t *data, slang_semantic semantic, void Pass::build_semantic_vec4(uint8_t *data, slang_semantic semantic,
@ -1636,7 +1635,6 @@ private:
bool init_feedback(); bool init_feedback();
bool init_alias(); bool init_alias();
vector<unique_ptr<gl_core_shader::Framebuffer>> original_history; vector<unique_ptr<gl_core_shader::Framebuffer>> original_history;
void update_history();
bool require_clear = false; bool require_clear = false;
void clear_history_and_feedback(); void clear_history_and_feedback();
void update_feedback_info(); void update_feedback_info();
@ -1668,8 +1666,6 @@ void gl_core_filter_chain::update_history_info()
void gl_core_filter_chain::update_feedback_info() void gl_core_filter_chain::update_feedback_info()
{ {
unsigned i; unsigned i;
if (common.framebuffer_feedback.empty())
return;
for (i = 0; i < passes.size() - 1; i++) for (i = 0; i < passes.size() - 1; i++)
{ {
@ -1705,7 +1701,8 @@ void gl_core_filter_chain::build_offscreen_passes(const gl_core_viewport &vp)
} }
update_history_info(); update_history_info();
update_feedback_info(); if (!common.framebuffer_feedback.empty())
update_feedback_info();
const gl_core_shader::Texture original = { const gl_core_shader::Texture original = {
input_texture, input_texture,
@ -1732,32 +1729,6 @@ void gl_core_filter_chain::build_offscreen_passes(const gl_core_viewport &vp)
} }
} }
void gl_core_filter_chain::update_history()
{
unique_ptr<gl_core_shader::Framebuffer> tmp;
unique_ptr<gl_core_shader::Framebuffer> &back = original_history.back();
swap(back, tmp);
if (input_texture.width != tmp->get_size().width ||
input_texture.height != tmp->get_size().height ||
(input_texture.format != 0
&& input_texture.format != tmp->get_format()))
tmp->set_size({ input_texture.width, input_texture.height }, input_texture.format);
if (tmp->is_complete())
gl_core_framebuffer_copy(
tmp->get_framebuffer(),
common.quad_program,
common.quad_vbo,
common.quad_loc.flat_ubo_vertex,
tmp->get_size(),
input_texture.image);
/* Should ring buffer, but we don't have *that* many passes. */
move_backward(begin(original_history), end(original_history) - 1, end(original_history));
swap(original_history.front(), tmp);
}
void gl_core_filter_chain::end_frame() void gl_core_filter_chain::end_frame()
{ {
/* If we need to keep old frames, copy it after fragment is complete. /* If we need to keep old frames, copy it after fragment is complete.
@ -1765,7 +1736,31 @@ void gl_core_filter_chain::end_frame()
* pass is the last that reads from * pass is the last that reads from
* the history and dispatch the copy earlier. */ * the history and dispatch the copy earlier. */
if (!original_history.empty()) if (!original_history.empty())
update_history(); {
/* Update history */
unique_ptr<gl_core_shader::Framebuffer> tmp;
unique_ptr<gl_core_shader::Framebuffer> &back = original_history.back();
swap(back, tmp);
if (input_texture.width != tmp->get_size().width ||
input_texture.height != tmp->get_size().height ||
(input_texture.format != 0
&& input_texture.format != tmp->get_format()))
tmp->set_size({ input_texture.width, input_texture.height }, input_texture.format);
if (tmp->is_complete())
gl_core_framebuffer_copy(
tmp->get_framebuffer(),
common.quad_program,
common.quad_vbo,
common.quad_loc.flat_ubo_vertex,
tmp->get_size(),
input_texture.image);
/* Should ring buffer, but we don't have *that* many passes. */
move_backward(begin(original_history), end(original_history) - 1, end(original_history));
swap(original_history.front(), tmp);
}
} }
void gl_core_filter_chain::build_viewport_pass( void gl_core_filter_chain::build_viewport_pass(
@ -1813,7 +1808,11 @@ void gl_core_filter_chain::build_viewport_pass(
/* For feedback FBOs, swap current and previous. */ /* For feedback FBOs, swap current and previous. */
for (i = 0; i < passes.size(); i++) for (i = 0; i < passes.size(); i++)
passes[i]->end_frame(); {
gl_core_shader::Framebuffer *fb = passes[i]->get_feedback_framebuffer();
if (fb)
passes[i]->end_frame();
}
} }
bool gl_core_filter_chain::init_history() bool gl_core_filter_chain::init_history()