Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GL: fix segfault in GLGSRender::flip #15363

Merged
merged 2 commits into from
Mar 27, 2024
Merged

GL: fix segfault in GLGSRender::flip #15363

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c4810
GL: fix segfault in GLGSRender::flip
Megamouse Mar 27, 2024
49bd5dd
Merge branch 'master' into glfix
Megamouse Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/GL/GLPresent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ void GLGSRender::flip(const rsx::display_flip_info_t& info)
}

gl::screen.bind();
m_video_output_pass.run(cmd, areau(aspect_ratio), images.map(FN(x->id())), gamma, limited_range, avconfig.stereo_mode, filter);
Megamouse marked this conversation as resolved.
Show resolved Hide resolved
m_video_output_pass.run(cmd, areau(aspect_ratio), images.map(FN(x ? x->id() : GL_NONE)), gamma, limited_range, avconfig.stereo_mode, filter);
}
}

Expand Down