mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-20 11:04:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13429 from JosJuice/fix-broken-merge

Browse source 
Fix broken merge of PR #13181
This commit is contained in:
JosJuice 2025-03-15 17:53:11 +01:00 • committed by GitHub
commit 049e52ce1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/VideoCommon/OnScreenUI.cpp
View file

@ -252,7 +252,7 @@ void OnScreenUI::DrawImGui()
static_cast<int>(cmd.ClipRect.x), static_cast<int>(cmd.ClipRect.y), static_cast<int>(cmd.ClipRect.x), static_cast<int>(cmd.ClipRect.y),
static_cast<int>(cmd.ClipRect.z), static_cast<int>(cmd.ClipRect.w)), static_cast<int>(cmd.ClipRect.z), static_cast<int>(cmd.ClipRect.w)),
g_gfx->GetCurrentFramebuffer())); g_gfx->GetCurrentFramebuffer()));
g_gfx->SetTexture(0, static_cast<const AbstractTexture*>(cmd.TextureId)); g_gfx->SetTexture(0, reinterpret_cast<const AbstractTexture*>(cmd.TextureId));
g_gfx->DrawIndexed(base_index, cmd.ElemCount, base_vertex); g_gfx->DrawIndexed(base_index, cmd.ElemCount, base_vertex);
base_index += cmd.ElemCount; base_index += cmd.ElemCount;
} }