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

Jump to bottom

Two crashfixes: Achievements menu, Outrun #19358

Merged
merged 2 commits into from
Jul 22, 2024
Merged

Two crashfixes: Achievements menu, Outrun #19358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4aafa3
Fix crash showing the Achievements screen.
hrydgard Jul 22, 2024
92938f8
Vertex decoder, SSE opt: Use the correct store operation to store 64 …
hrydgard Jul 22, 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 GPU/Common/VertexDecoderHandwritten.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void VtxDec_Tu16_C8888_Pfloat(const u8 *srcp, u8 *dstp, int count, const UVScale
__m128 finalUV = _mm_add_ps(_mm_mul_ps(fuv, uvScale), uvOff);
u32 normal = src[i].packed_normal;
__m128i colpos = _mm_loadu_si128((const __m128i *)&src[i].col);
_mm_store1_pd((double *)&dst[i].u, _mm_castps_pd(finalUV));
_mm_store_sd((double *)&dst[i].u, _mm_castps_pd(finalUV));
dst[i].packed_normal = normal;
_mm_storeu_si128((__m128i *)&dst[i].col, colpos);
alphaMask = _mm_and_si128(alphaMask, colpos);
Expand Down
7 changes: 7 additions & 0 deletions SDL/README.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,10 @@ Under the assets directory is the SDL2 game controller database: gamecontrollerd
Hot plugging of control pads is also supported.

If you control pad has a "Guide" or "Home" button then when pressed, this will trigger the emulator pause menu, thus allowing you to exit the emulator if you wish or load another game from your library.

WSL notes
=========
Works fine on WSL2 with OpenGL, at least. For more notes, see https://www.ppsspp.org/docs/development/wsl/ .

Running with valgrind
=====================
45 changes: 45 additions & 0 deletions SDL/valgrind-wsl2.supp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,24 @@
...
obj:/usr/lib/wsl/lib/libd3d12core.so
}
{
<d3d12_2>
Memcheck:Addr1
...
obj:/usr/lib/wsl/lib/libd3d12core.so
}
{
<d3d12_2>
Memcheck:Addr8
...
obj:/usr/lib/wsl/lib/libd3d12core.so
}
{
<d3d12_12>
Memcheck:Addr16
...
obj:/usr/lib/wsl/lib/libd3d12.so
}
{
<d3d12_1>
Memcheck:Addr8
Expand All @@ -40,6 +52,12 @@
...
obj:/usr/lib/wsl/lib/libd3d12core.so
}
{
<d3d12_29>
Memcheck:Addr16
...
obj:/usr/lib/wsl/lib/libd3d12core.so
}
{
<d3d12_14>
Memcheck:Addr4
Expand All @@ -52,6 +70,12 @@
...
obj:/usr/lib/wsl/lib/libd3d12core.so
}
{
<d3d12_24>
Memcheck:Addr1
...
obj:/usr/lib/wsl/lib/libd3d12core.so
}
{
<d3d12_14>
Memcheck:Addr2
Expand All @@ -70,3 +94,24 @@
...
obj:/usr/lib/wsl/drivers/nvmdig.inf_amd64_e08347d07a4d61e2/libnvwgf2umx.so
}
{
<vk1>
Memcheck:Cond
obj:/usr/lib/wsl/lib/libdxcore.so
...
obj:/usr/lib/x86_64-linux-gnu/libvulkan.so.*
}
{
<vk2>
Memcheck:Cond
...
obj:/usr/lib/wsl/drivers/nvmdig.inf_amd64_e08347d07a4d61e2/libnvwgf2umx.so
}
{
<swrast>
Memcheck:Addr8
fun:memmove
...
obj:/usr/lib/x86_64-linux-gnu/dri/swrast_dri.so
...
}
2 changes: 1 addition & 1 deletion UI/RetroAchievementScreens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void RetroAchievementsListScreen::CreateAchievementsTab(UI::ViewGroup *achieveme
if (!bucket.num_achievements) {
continue;
}
std::string title = StringFromFormat("%s (%d)", ac->T(AchievementBucketTitle(bucket.bucket_type)), bucket.num_achievements);
std::string title = StringFromFormat("%s (%d)", ac->T_cstr(AchievementBucketTitle(bucket.bucket_type)), bucket.num_achievements);
CollapsibleSection *section = achievements->Add(new CollapsibleSection(title));
section->SetSpacing(2.0f);
for (uint32_t j = 0; j < bucket.num_achievements; j++) {
Expand Down
Loading