MirrorRepos/azahar
1
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2026-06-06 02:33:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

vulkan reduced secondary window (or android) drawing

Browse source
This commit is contained in:
KojoZero 2026-06-01 03:22:54 -07:00
parent f5b4d24988
commit 5a5b2ef858
3 changed files with 96 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/video_core/renderer_opengl/renderer_opengl.cpp
View file

@ -425,7 +425,7 @@ void RendererOpenGL::AllocateOutputSizeTextures(){
}
}
LOG_INFO(Render_OpenGL, "Reallocated OutputSize Textures. PrevRects:\n{}x{}\n{}x{}\n{}x{}\nCurrRects:\n{}x{}\n{}x{}\n{}x{}",
LOG_INFO(Render_OpenGL, "Reallocated OutputSize Textures.\nPrevRects:\n{}x{}\n{}x{}\n{}x{}\nCurrRects:\n{}x{}\n{}x{}\n{}x{}",
prevOutputScreenRects[isSecondaryWindow][0].GetWidth(), prevOutputScreenRects[isSecondaryWindow][0].GetHeight(),
prevOutputScreenRects[isSecondaryWindow][1].GetWidth(), prevOutputScreenRects[isSecondaryWindow][1].GetHeight(),
prevOutputScreenRects[isSecondaryWindow][2].GetWidth(), prevOutputScreenRects[isSecondaryWindow][2].GetHeight(),
@ -433,7 +433,6 @@ void RendererOpenGL::AllocateOutputSizeTextures(){
currOutputScreenRects[isSecondaryWindow][1].GetWidth(), currOutputScreenRects[isSecondaryWindow][1].GetHeight(),
currOutputScreenRects[isSecondaryWindow][2].GetWidth(), currOutputScreenRects[isSecondaryWindow][2].GetHeight()
);
//
}
/**

109
src/video_core/renderer_vulkan/renderer_vulkan.cpp
View file

@ -586,7 +586,15 @@ void RendererVulkan::AllocateOutputSizeTextures(){
AllocateTexture(intermediateOutputSizeTextures[isSecondaryWindow][i][j], currOutputScreenRects[isSecondaryWindow][i].GetWidth(), currOutputScreenRects[isSecondaryWindow][i].GetHeight(), vk::Format::eR16G16B16A16Sfloat);
}
}
LOG_INFO(Render_Vulkan, "Reallocated Output Size Textures");
// LOG_INFO(Render_Vulkan, "Reallocated Output Size Textures");
LOG_INFO(Render_OpenGL, "Reallocated OutputSize Textures.\nPrevRects:\n{}x{}\n{}x{}\n{}x{}\nCurrRects:\n{}x{}\n{}x{}\n{}x{}",
prevOutputScreenRects[isSecondaryWindow][0].GetWidth(), prevOutputScreenRects[isSecondaryWindow][0].GetHeight(),
prevOutputScreenRects[isSecondaryWindow][1].GetWidth(), prevOutputScreenRects[isSecondaryWindow][1].GetHeight(),
prevOutputScreenRects[isSecondaryWindow][2].GetWidth(), prevOutputScreenRects[isSecondaryWindow][2].GetHeight(),
currOutputScreenRects[isSecondaryWindow][0].GetWidth(), currOutputScreenRects[isSecondaryWindow][0].GetHeight(),
currOutputScreenRects[isSecondaryWindow][1].GetWidth(), currOutputScreenRects[isSecondaryWindow][1].GetHeight(),
currOutputScreenRects[isSecondaryWindow][2].GetWidth(), currOutputScreenRects[isSecondaryWindow][2].GetHeight()
);
};
void RendererVulkan::CreateOutputSizeTextureFramebuffers(){
@ -2082,24 +2090,76 @@ void RendererVulkan::DrawScreens(Frame* frame, const Layout::FramebufferLayout&
clearingColorAttachment = true;
applyingOpacity = true;
if (!Settings::values.swap_screen.GetValue()) {
drawingPrimaryScreen = true;
DrawTopScreen(layout, top_screen);
draw_info.layer = 0;
drawingPrimaryScreen = false;
usingTopOpacity = false;
clearingColorAttachment = false;
DrawBottomScreen(layout, bottom_screen);
if (!secondaryWindowEnabled){
if (!Settings::values.swap_screen.GetValue()) {
drawingPrimaryScreen = true;
DrawTopScreen(layout, top_screen);
draw_info.layer = 0;
drawingPrimaryScreen = false;
usingTopOpacity = false;
clearingColorAttachment = false;
DrawBottomScreen(layout, bottom_screen);
} else {
drawingPrimaryScreen = true;
DrawBottomScreen(layout, bottom_screen);
draw_info.layer = 0;
drawingPrimaryScreen = false;
usingTopOpacity = true;
clearingColorAttachment = false;
DrawTopScreen(layout, top_screen);
}
} else {
drawingPrimaryScreen = true;
DrawBottomScreen(layout, bottom_screen);
draw_info.layer = 0;
drawingPrimaryScreen = false;
usingTopOpacity = true;
clearingColorAttachment = false;
DrawTopScreen(layout, top_screen);
if (!Settings::values.swap_screen.GetValue()) {
if (usingAndroid){
// Change this block to conditionally display based on layout of primary and secondary screen
if (isSecondaryWindow){
return;
} else {
drawingPrimaryScreen = true;
DrawTopScreen(layout, top_screen);
draw_info.layer = 0;
drawingPrimaryScreen = false;
usingTopOpacity = false;
clearingColorAttachment = false;
DrawBottomScreen(layout, bottom_screen);
}
} else {
if (isSecondaryWindow) {
drawingPrimaryScreen = true;
DrawBottomScreen(layout, bottom_screen);
} else {
drawingPrimaryScreen = true;
DrawTopScreen(layout, top_screen);
}
}
} else {
if (usingAndroid){
// Change this block to conditionally display based on layout of primary and secondary screen
if (isSecondaryWindow){
return;
} else {
drawingPrimaryScreen = true;
DrawBottomScreen(layout, bottom_screen);
draw_info.layer = 0;
drawingPrimaryScreen = false;
usingTopOpacity = true;
clearingColorAttachment = false;
DrawTopScreen(layout, top_screen);
}
} else {
if (isSecondaryWindow) {
drawingPrimaryScreen = true;
DrawTopScreen(layout, top_screen);
} else {
drawingPrimaryScreen = true;
DrawBottomScreen(layout, bottom_screen);
}
}
}
}
applyingOpacity = false;
if (layout.additional_screen_enabled) {
const auto& additional_screen = layout.additional_screen;
@ -2176,6 +2236,23 @@ void RendererVulkan::DrawCursor(const Layout::FramebufferLayout& layout) {
void RendererVulkan::SwapBuffers() {
system.perf_stats->StartSwap();
#ifndef ANDROID
if (Settings::values.layout_option.GetValue() == Settings::LayoutOption::SeparateWindows) {
ASSERT(secondary_window);
secondaryWindowEnabled = true;
} else {
secondaryWindowEnabled = false;
}
#endif
#ifdef ANDROID
usingAndroid = true;
if (secondary_window) {
secondaryWindowEnabled = true;
} else {
secondaryWindowEnabled = false;
}
#endif
const Layout::FramebufferLayout& layout = render_window.GetFramebufferLayout();
PrepareRendertarget();
RenderScreenshot();

2
src/video_core/renderer_vulkan/renderer_vulkan.h
View file

@ -269,6 +269,8 @@ private:
// Secondary Layout Fix
bool isSecondaryWindow;
bool secondaryWindowEnabled;
bool usingAndroid;
};
} // namespace Vulkan