Skip to content

Commit 3398665

Browse files
1111omen1111omen
authored
Merge branch 'master' into 1111omen-updated-file
2 parents cb5eef1 + 5a67eb5 commit 3398665

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+540
-470
lines changed

‎.github/workflows/appimage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Install git
4949
run: pacman -Syu --noconfirm git
5050

51-
- uses: actions/checkout@v5
51+
- uses: actions/checkout@v6
5252
with:
5353
fetch-depth: 0
5454
submodules: recursive
@@ -272,7 +272,7 @@ jobs:
272272
path: artifacts/
273273

274274
- name: Upload release
275-
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
275+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
276276
if: github.ref_type == 'tag'
277277
with:
278278
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
runs-on: windows-latest
3636
steps:
37-
- uses: actions/checkout@v5
37+
- uses: actions/checkout@v6
3838
with:
3939
submodules: recursive
4040

@@ -113,15 +113,15 @@ jobs:
113113
Compress-Archive -Path "ppsspp/*" -Update -DestinationPath "releases/PPSSPP-${{ github.ref_name }}-Windows-${{ matrix.platform }}.zip"
114114
115115
- name: Upload release
116-
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
116+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
117117
if: github.ref_type == 'tag'
118118
with:
119119
files: releases/*.zip
120120

121121
build-uwp:
122122
runs-on: windows-latest
123123
steps:
124-
- uses: actions/checkout@v5
124+
- uses: actions/checkout@v6
125125
with:
126126
submodules: recursive
127127

@@ -137,7 +137,7 @@ jobs:
137137
needs: build-windows
138138
timeout-minutes: 30
139139
steps:
140-
- uses: actions/checkout@v5
140+
- uses: actions/checkout@v6
141141
with:
142142
submodules: false
143143

@@ -249,7 +249,7 @@ jobs:
249249

250250
runs-on: ${{ matrix.os }}
251251
steps:
252-
- uses: actions/checkout@v5
252+
- uses: actions/checkout@v6
253253
with:
254254
submodules: recursive
255255

@@ -305,7 +305,7 @@ jobs:
305305
echo "#define PPSSPP_GIT_VERSION_NO_UPDATE 1" >> git-version.cpp
306306
307307
- name: Setup ccache
308-
uses: hendrikmuhs/ccache-action@bfa03e1de4d7f7c3e80ad9109feedd05c4f5a716 # v1.2.19
308+
uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639 # v1.2.20
309309
# Disable ccache on macos for now, it's become buggy for some reason.
310310
if: matrix.id != 'macos'
311311
with:
@@ -387,7 +387,7 @@ jobs:
387387
run: mv PPSSPPSDL.zip PPSSPPSDL-macOS-${GITHUB_REF_NAME}.zip
388388

389389
- name: Upload macOS & iOS release
390-
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
390+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
391391
if: github.ref_type == 'tag' && (matrix.id == 'macos' || matrix.id == 'ios')
392392
with:
393393
files: |
@@ -411,7 +411,7 @@ jobs:
411411
needs: build
412412
timeout-minutes: 30
413413
steps:
414-
- uses: actions/checkout@v5
414+
- uses: actions/checkout@v6
415415
with:
416416
submodules: false
417417

@@ -465,7 +465,7 @@ jobs:
465465
run: |
466466
apk add build-base wget git bash cmake python3 glu-dev sdl2-dev
467467
468-
- uses: actions/checkout@v5
468+
- uses: actions/checkout@v6
469469
with:
470470
submodules: recursive
471471

@@ -474,7 +474,7 @@ jobs:
474474
chown -R $(id -u):$(id -g) $PWD
475475
476476
- name: Setup ccache
477-
uses: hendrikmuhs/ccache-action@bfa03e1de4d7f7c3e80ad9109feedd05c4f5a716 # v1.2.19
477+
uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639 # v1.2.20
478478

479479
- name: Compile ffmpeg
480480
run: |

‎.github/workflows/manual_generate_apk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
with:
2727
fetch-depth: 0
2828
submodules: recursive

‎.github/workflows/manual_generate_ipa.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: macos-latest
99

1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
with:
1313
fetch-depth: 0
1414
submodules: recursive
@@ -49,7 +49,7 @@ jobs:
4949
echo ${GIT_VERSION#v} > build-ios/PPSSPP.app/Version.txt
5050
5151
- name: Setup ccache
52-
uses: hendrikmuhs/ccache-action@bfa03e1de4d7f7c3e80ad9109feedd05c4f5a716 # v1.2.19
52+
uses: hendrikmuhs/ccache-action@5ebbd400eff9e74630f759d94ddd7b6c26299639 # v1.2.20
5353
with:
5454
key: ios
5555
create-symlink: true

‎.github/workflows/manual_generate_uwp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: windows-latest
3737

3838
steps:
39-
- uses: actions/checkout@v5
39+
- uses: actions/checkout@v6
4040
with:
4141
fetch-depth: 0
4242
submodules: recursive

‎.github/workflows/tarball.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
with:
1818
submodules: recursive
1919

@@ -39,7 +39,7 @@ jobs:
3939
echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
4040
4141
- name: Upload tarball
42-
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
42+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
4343
with:
4444
files: ${{ steps.archive.outputs.tarball }}
4545
token: ${{ secrets.GITHUB_TOKEN }}

‎CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,10 @@ if(ARM64)
949949
endif()
950950
endif()
951951

952+
if(TARGET Ext::GLEW)
953+
target_link_libraries(Common Ext::GLEW)
954+
endif()
955+
952956
if(USING_GLES2 OR (USING_EGL AND NOT USING_FBDEV))
953957
find_package(X11)
954958
endif()
@@ -2771,7 +2775,6 @@ endif()
27712775
list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT})
27722776

27732777
if(WIN32)
2774-
list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput winmm dinput8 ole32 winspool ksuser dwmapi mf uxtheme mfplat mfreadwrite mfuuid shlwapi setupapi hid)
27752778
#setup_target_project(${TargetBin} Windows)
27762779
list(APPEND NativeAppSource ${WindowsFiles})
27772780
endif()
@@ -2968,8 +2971,8 @@ if(TargetBin)
29682971
add_executable(${TargetBin} WIN32 ${NativeAppSource})
29692972
if(NOT MSVC)
29702973
target_compile_options(${TargetBin} PRIVATE $<$<CXX_COMPILER_ID:Clang>:-Wno-c++11-narrowing>)
2971-
target_link_libraries(${TargetBin} Version Dwmapi Avrt)
29722974
endif()
2975+
target_link_libraries(${TargetBin} avrt comctl32 dinput8 dwmapi hid ksuser mfplat setupapi uxtheme version)
29732976
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${TargetBin})
29742977
else()
29752978
add_executable(${TargetBin} ${NativeAppSource})

‎Common/Data/Encoding/Utf8.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ void ConvertUTF8ToJavaModifiedUTF8(std::string *output, std::string_view input)
327327
break;
328328
}
329329
// Decode the Unicode code point from the UTF-8 sequence
330-
uint32_t code_point = ((input[i] & 0x07) << 18) |
330+
const uint32_t code_point = ((input[i] & 0x07) << 18) |
331331
((input[i + 1] & 0x3F) << 12) |
332332
((input[i + 2] & 0x3F) << 6) |
333333
(input[i + 3] & 0x3F);

‎Common/Render/DrawBuffer.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ void DrawBuffer::MeasureText(FontID font, std::string_view text, float *w, float
528528
if (h) *h = atlasfont->height * fontscaley * lines;
529529
}
530530

531-
void DrawBuffer::MeasureTextRect(FontID font_id, std::string_view text, const Bounds &bounds, float *w, float *h, int align) {
531+
void DrawBuffer::MeasureTextRect(FontID font_id, std::string_view text, float maxWidth, float *w, float *h, int align) {
532532
if (text.empty() || font_id.isInvalid()) {
533533
*w = 0.0f;
534534
*h = 0.0f;
@@ -546,7 +546,7 @@ void DrawBuffer::MeasureTextRect(FontID font_id, std::string_view text, const Bo
546546
return;
547547
}
548548
std::string toMeasure = std::string(text);
549-
AtlasWordWrapper wrapper(*font, fontscalex, toMeasure, bounds.w, wrap);
549+
AtlasWordWrapper wrapper(*font, fontscalex, toMeasure, maxWidth, wrap);
550550
toMeasure = wrapper.Wrapped();
551551
MeasureText(font_id, toMeasure, w, h);
552552
} else {
@@ -591,7 +591,7 @@ void DrawBuffer::DrawTextRect(FontID font, std::string_view text, float x, float
591591
}
592592

593593
float totalWidth, totalHeight;
594-
MeasureTextRect(font, toDraw, Bounds(x, y, w, h), &totalWidth, &totalHeight, align);
594+
MeasureTextRect(font, toDraw, w, &totalWidth, &totalHeight, align);
595595

596596
std::vector<std::string_view> lines;
597597
SplitString(toDraw, '\n', lines);

‎Common/Render/DrawBuffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ class DrawBuffer {
128128
void DrawImage2GridH(ImageID atlas_image, float x1, float y1, float x2, Color color = COLOR(0xFFFFFF), float scale = 1.0);
129129

130130
void MeasureText(FontID font, std::string_view text, float *w, float *h);
131-
132-
void MeasureTextRect(FontID font, std::string_view text, const Bounds &bounds, float *w, float *h, int align = 0);
131+
void MeasureTextRect(FontID font, std::string_view text, float maxWidth, float *w, float *h, int align = 0);
133132

134133
void DrawTextRect(FontID font, std::string_view text, float x, float y, float w, float h, Color color = 0xFFFFFFFF, int align = 0);
135134
void DrawText(FontID font, std::string_view text, float x, float y, Color color = 0xFFFFFFFF, int align = 0);

0 commit comments

Comments
 (0)