dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-04-29 23:41:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

clang

Browse Source
This commit is contained in:
w1naenator 2026-01-09 13:04:48 +02:00
parent d845b9503d
commit 78faac52e5
3 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/core/libraries/font/font.cpp
View File

@ -567,7 +567,7 @@ static std::filesystem::path GetSysFontBaseDir() {
}
static std::filesystem::path ResolveSystemFontPathCandidate(const std::filesystem::path& base_dir,
const std::filesystem::path& filename) {
const std::filesystem::path& filename) {
if (base_dir.empty() || filename.empty()) {
return {};
}
@ -4446,8 +4446,7 @@ s32 PS4_SYSV_ABI sceFontOpenFontSet(OrbisFontLib library, u32 fontSetType, u32 o
if (!face) {
return 1.0f;
}
const TT_OS2* os2 =
static_cast<const TT_OS2*>(FT_Get_Sfnt_Table(face, ft_sfnt_os2));
const TT_OS2* os2 = static_cast<const TT_OS2*>(FT_Get_Sfnt_Table(face, ft_sfnt_os2));
if (os2) {
if (os2->sTypoAscender == 770 && os2->sTypoDescender == -230) {
return 1024.0f / 952.0f;
@ -4459,8 +4458,7 @@ s32 PS4_SYSV_ABI sceFontOpenFontSet(OrbisFontLib library, u32 fontSetType, u32 o
if (!face) {
return 0;
}
const TT_OS2* os2 =
static_cast<const TT_OS2*>(FT_Get_Sfnt_Table(face, ft_sfnt_os2));
const TT_OS2* os2 = static_cast<const TT_OS2*>(FT_Get_Sfnt_Table(face, ft_sfnt_os2));
if (!os2) {
return 0;
}
@ -4481,11 +4479,12 @@ s32 PS4_SYSV_ABI sceFontOpenFontSet(OrbisFontLib library, u32 fontSetType, u32 o
}
return 0;
};
st.system_font_scale_factor = compute_sysfont_scale_factor(st.ext_ft_face, st.ext_units_per_em);
st.system_font_scale_factor =
compute_sysfont_scale_factor(st.ext_ft_face, st.ext_units_per_em);
st.system_font_shift_value = compute_sysfont_shift_value(st.ext_ft_face);
LOG_DEBUG(Lib_Font, "SystemFonts: primary='{}' unitsPerEm={} scaleFactor={} shiftValue={}",
primary_path.filename().string(), st.ext_units_per_em, st.system_font_scale_factor,
st.system_font_shift_value);
primary_path.filename().string(), st.ext_units_per_em,
st.system_font_scale_factor, st.system_font_shift_value);
std::string preferred_latin_name_lower;
const auto base_dir = Internal::GetSysFontBaseDir();
@ -4595,11 +4594,12 @@ s32 PS4_SYSV_ABI sceFontOpenFontSet(OrbisFontLib library, u32 fontSetType, u32 o
fb.scale_factor = compute_sysfont_scale_factor(
fb.ft_face, fb.ft_face ? static_cast<int>(fb.ft_face->units_per_EM) : 0);
fb.shift_value = compute_sysfont_shift_value(fb.ft_face);
LOG_DEBUG(Lib_Font,
"SystemFonts: fallback='{}' unitsPerEm={} scaleFactor={} shiftValue={}",
fb.path.filename().string(),
fb.ft_face ? static_cast<int>(fb.ft_face->units_per_EM) : 0,
fb.scale_factor, fb.shift_value);
LOG_DEBUG(
Lib_Font,
"SystemFonts: fallback='{}' unitsPerEm={} scaleFactor={} shiftValue={}",
fb.path.filename().string(),
fb.ft_face ? static_cast<int>(fb.ft_face->units_per_EM) : 0,
fb.scale_factor, fb.shift_value);
st.system_fallback_faces.push_back(std::move(fb));
} else {
Internal::DestroyFreeTypeFace(fb.ft_face);
@ -4776,7 +4776,8 @@ s32 PS4_SYSV_ABI sceFontOpenFontSet(OrbisFontLib library, u32 fontSetType, u32 o
default:
break;
}
const bool is_sea_weight = (sea_weight_code == 0x53u) || (sea_weight_code == 0x54u) ||
const bool is_sea_weight = (sea_weight_code == 0x53u) ||
(sea_weight_code == 0x54u) ||
(sea_weight_code == 0x55u) || (sea_weight_code == 0x57u);
if (is_sea_weight && primary_name_lower.rfind("sstvietnamese-", 0) != 0) {
@ -4802,9 +4803,9 @@ s32 PS4_SYSV_ABI sceFontOpenFontSet(OrbisFontLib library, u32 fontSetType, u32 o
}
}
if (is_sea_weight && ((tag == 0x10u) || (tag == 0x14u) || (tag == 0x34u) ||
(tag == 0x90u) || (tag == 0x94u) || (tag == 0xB0u) ||
(tag == 0xB4u) || (tag == 0xBCu))) {
if (is_sea_weight &&
((tag == 0x10u) || (tag == 0x14u) || (tag == 0x34u) || (tag == 0x90u) ||
(tag == 0x94u) || (tag == 0xB0u) || (tag == 0xB4u) || (tag == 0xBCu))) {
const char* th_file = nullptr;
switch (sea_weight_code) {
case 0x53:
@ -4883,11 +4884,12 @@ s32 PS4_SYSV_ABI sceFontOpenFontSet(OrbisFontLib library, u32 fontSetType, u32 o
fb.scale_factor = compute_sysfont_scale_factor(
fb.ft_face, fb.ft_face ? static_cast<int>(fb.ft_face->units_per_EM) : 0);
fb.shift_value = compute_sysfont_shift_value(fb.ft_face);
LOG_DEBUG(Lib_Font,
"SystemFonts: fallback='{}' unitsPerEm={} scaleFactor={} shiftValue={}",
fb.path.filename().string(),
fb.ft_face ? static_cast<int>(fb.ft_face->units_per_EM) : 0,
fb.scale_factor, fb.shift_value);
LOG_DEBUG(
Lib_Font,
"SystemFonts: fallback='{}' unitsPerEm={} scaleFactor={} shiftValue={}",
fb.path.filename().string(),
fb.ft_face ? static_cast<int>(fb.ft_face->units_per_EM) : 0,
fb.scale_factor, fb.shift_value);
st.system_fallback_faces.push_back(std::move(fb));
} else {
Internal::DestroyFreeTypeFace(fb.ft_face);
@ -5281,7 +5283,7 @@ s32 PS4_SYSV_ABI sceFontOpenFontSet(OrbisFontLib library, u32 fontSetType, u32 o
header->entry_count = entry_count;
auto* entries = reinterpret_cast<u32*>(st.fontset_record_storage->data() +
sizeof(Internal::FontSetRecordHeader));
sizeof(Internal::FontSetRecordHeader));
for (u32 i = 0; i < entry_count; ++i) {
std::construct_at(entries + i, font_ids[i]);
}
@ -5484,7 +5486,8 @@ s32 PS4_SYSV_ABI sceFontRenderCharGlyphImage(OrbisFontHandle fontHandle, u32 cod
int& count = s_baseline_log_counts[fontHandle];
if (count < 5) {
LOG_DEBUG(Lib_Font,
"RenderBaseline: handle={} code=U+{:04X} y_in={} baseline_add={} y_used={} pre_rc={}",
"RenderBaseline: handle={} code=U+{:04X} y_in={} baseline_add={} "
"y_used={} pre_rc={}",
static_cast<const void*>(fontHandle), code, y, baseline_add, y_used,
pre_rc);
++count;

2
src/core/libraries/font/font_internal.cpp
View File

@ -1599,7 +1599,7 @@ std::filesystem::path GetSysFontBaseDir() {
}
static std::filesystem::path ResolveSystemFontPathCandidate(const std::filesystem::path& base_dir,
const std::filesystem::path& filename) {
const std::filesystem::path& filename) {
if (base_dir.empty() || filename.empty()) {
return {};
}

69
src/core/libraries/font/fontft_internal.cpp
View File

@ -3,9 +3,9 @@
#include "core/libraries/font/fontft_internal.h"
#include <bit>
#include <algorithm>
#include <atomic>
#include <bit>
#include <cmath>
#include <cstddef>
#include <cstdint>
@ -51,8 +51,7 @@ static void UpdateFtFontObjShiftCache(u8* font_obj) {
obj->shift_cache_x = static_cast<s64>(obj->shift_units_x);
obj->shift_cache_y = static_cast<s64>(obj->shift_units_y);
const s32 seed_low =
static_cast<s32>(static_cast<u32>(obj->layout_seed_pair & 0xFFFFFFFFu));
const s32 seed_low = static_cast<s32>(static_cast<u32>(obj->layout_seed_pair & 0xFFFFFFFFu));
const s32 seed_high =
static_cast<s32>(static_cast<u32>((obj->layout_seed_pair >> 32) & 0xFFFFFFFFu));
obj->layout_seed_vec[0] = static_cast<std::uint64_t>(static_cast<std::int64_t>(seed_low));
@ -247,9 +246,8 @@ static void ApplyGlyphSpecialCaseAdjust(int font_id, int glyph_index, int* inout
}
if (((font_id == 10) && (static_cast<u32>(glyph_index - 0x23d1U) < 0x5e)) &&
((0x5c0000000017ULL >>
(static_cast<u64>(
static_cast<u8>((static_cast<u8>(glyph_index - 0x23d1U) >> 1) & 0x3f)) &
0x3fULL)) &
(static_cast<u64>(static_cast<u8>((static_cast<u8>(glyph_index - 0x23d1U) >> 1) & 0x3f)) &
0x3fULL)) &
1ULL) != 0) {
inout_seed_words[0] = inout_seed_words[0] + 500;
}
@ -341,7 +339,8 @@ u32 ResolveSysFontCodepoint(const void* record, u64 code, u32 flags, u32* out_fo
if (rec->magic == Libraries::Font::Internal::FontSetSelector::kMagic) {
const auto view = MakeFontSetRecordView(rec);
const u32 entry_count = view.header ? view.header->entry_count : 0u;
const u32 record_primary_id = (entry_count && view.entry_indices) ? view.entry_indices[0] : 0u;
const u32 record_primary_id =
(entry_count && view.entry_indices) ? view.entry_indices[0] : 0u;
const auto* selector = view.selector;
if (!selector || selector->magic != Libraries::Font::Internal::FontSetSelector::kMagic) {
if (out_font_id) {
@ -352,17 +351,15 @@ u32 ResolveSysFontCodepoint(const void* record, u64 code, u32 flags, u32* out_fo
const u32 primary_id = selector->primary_font_id != 0xffffffffu ? selector->primary_font_id
: record_primary_id;
const u32 roman_id = selector->roman_font_id != 0xffffffffu ? selector->roman_font_id
: record_primary_id;
const u32 arabic_id = selector->arabic_font_id != 0xffffffffu ? selector->arabic_font_id : roman_id;
const u32 roman_id =
selector->roman_font_id != 0xffffffffu ? selector->roman_font_id : record_primary_id;
const u32 arabic_id =
selector->arabic_font_id != 0xffffffffu ? selector->arabic_font_id : roman_id;
auto is_cjk_like = [](u32 cp) -> bool {
if ((cp >= 0x3040u && cp <= 0x30FFu) ||
(cp >= 0x31F0u && cp <= 0x31FFu) ||
(cp >= 0x3400u && cp <= 0x4DBFu) ||
(cp >= 0x4E00u && cp <= 0x9FFFu) ||
(cp >= 0xAC00u && cp <= 0xD7AFu) ||
(cp >= 0xF900u && cp <= 0xFAFFu) ||
if ((cp >= 0x3040u && cp <= 0x30FFu) || (cp >= 0x31F0u && cp <= 0x31FFu) ||
(cp >= 0x3400u && cp <= 0x4DBFu) || (cp >= 0x4E00u && cp <= 0x9FFFu) ||
(cp >= 0xAC00u && cp <= 0xD7AFu) || (cp >= 0xF900u && cp <= 0xFAFFu) ||
(cp >= 0x20000u && cp <= 0x2FA1Fu)) {
return true;
}
@ -374,8 +371,7 @@ u32 ResolveSysFontCodepoint(const void* record, u64 code, u32 flags, u32* out_fo
(cp >= 0xFE70u && cp <= 0xFEFFu);
};
auto is_symbol_like = [](u32 cp) -> bool {
return (cp >= 0x25A0u && cp <= 0x25FFu) ||
(cp >= 0x2600u && cp <= 0x26FFu) ||
return (cp >= 0x25A0u && cp <= 0x25FFu) || (cp >= 0x2600u && cp <= 0x26FFu) ||
(cp >= 0x2700u && cp <= 0x27BFu);
};
@ -665,7 +661,8 @@ s32 ComputeHorizontalLayoutBlocks(OrbisFontHandle fontHandle, const void* style_
float fontset_scale_factor = 1.0f;
int fontset_shift_value = 0;
if (fontset_record && fontset_record->magic == Libraries::Font::Internal::FontSetSelector::kMagic) {
if (fontset_record &&
fontset_record->magic == Libraries::Font::Internal::FontSetSelector::kMagic) {
if (auto* st = Internal::TryGetState(fontHandle)) {
if (st->system_requested) {
if (font_id == st->system_font_id) {
@ -811,7 +808,8 @@ s32 ComputeHorizontalLayoutBlocks(OrbisFontHandle fontHandle, const void* style_
const float line_h = baseline_max + delta_max;
const float effect_h = maxss(effect_for_baseline, effect_for_delta);
if ((reinterpret_cast<std::uintptr_t>(out_words) & (alignof(HorizontalLayoutBlocks) - 1)) == 0) {
if ((reinterpret_cast<std::uintptr_t>(out_words) & (alignof(HorizontalLayoutBlocks) - 1)) ==
0) {
auto* out_blocks = reinterpret_cast<HorizontalLayoutBlocks*>(out_words);
out_blocks->set_baseline(baseline_max);
out_blocks->set_line_advance(line_h);
@ -981,11 +979,10 @@ s32 ComputeVerticalLayoutBlocks(OrbisFontHandle fontHandle, const void* style_st
VerticalLayoutAltBlocks layout_alt{};
if (call_rc == ORBIS_OK) {
UpdateFtFontObjShiftCache(reinterpret_cast<u8*>(font_obj));
call_rc =
driver->compute_layout_alt
? driver->compute_layout_alt(font_obj, style_state_block,
LayoutWordsBytes(layout_alt.words()))
: ORBIS_FONT_ERROR_FATAL;
call_rc = driver->compute_layout_alt
? driver->compute_layout_alt(font_obj, style_state_block,
LayoutWordsBytes(layout_alt.words()))
: ORBIS_FONT_ERROR_FATAL;
}
if (call_rc == ORBIS_OK) {
@ -1005,12 +1002,14 @@ s32 ComputeVerticalLayoutBlocks(OrbisFontHandle fontHandle, const void* style_st
if (acc_neg_local64_max < neg_baseline_offset_x_candidate) {
assoc_for_neg_local64_max = decoration_span_candidate;
}
acc_neg_local64_max = std::max(acc_neg_local64_max, neg_baseline_offset_x_candidate);
acc_neg_local64_max =
std::max(acc_neg_local64_max, neg_baseline_offset_x_candidate);
if (acc_sum_max < sum_primary_0x00_and_baseline_offset_x_candidate) {
assoc_for_sum_max = decoration_span_candidate;
}
acc_sum_max = std::max(acc_sum_max, sum_primary_0x00_and_baseline_offset_x_candidate);
acc_sum_max =
std::max(acc_sum_max, sum_primary_0x00_and_baseline_offset_x_candidate);
const float diff = extra_0x08 - baseline_offset_x_candidate;
acc_diff_min = std::min(diff, acc_diff_min);
@ -1076,7 +1075,8 @@ s32 ComputeVerticalLayoutBlocks(OrbisFontHandle fontHandle, const void* style_st
const float unknown_decoration_0x08 = acc_temp_min - acc_neg_local64_max;
const float unknown_decoration_0x0C = -acc_sum_max;
if ((reinterpret_cast<std::uintptr_t>(out_words) & (alignof(VerticalLayoutBlocks) - 1)) == 0) {
if ((reinterpret_cast<std::uintptr_t>(out_words) & (alignof(VerticalLayoutBlocks) - 1)) ==
0) {
auto* out_blocks = reinterpret_cast<VerticalLayoutBlocks*>(out_words);
out_blocks->set_column_advance(column_advance);
out_blocks->set_baseline_offset_x(baseline_offset_x);
@ -2487,8 +2487,7 @@ static bool ResolveSfntBaseOffset(const u8* data, std::size_t size, u32 subFontI
return false;
}
const u32 base =
static_cast<const BeU32*>(static_cast<const void*>(data + want_off))->value();
const u32 base = static_cast<const BeU32*>(static_cast<const void*>(data + want_off))->value();
if (base > size || (size - base) < 0x0C) {
return false;
}
@ -2548,7 +2547,8 @@ static bool ReadUnitsPerEm(const u8* data, std::size_t size, u32 base, u16& out_
if (head_len < 0x14 || head_off + 0x14 > size) {
return false;
}
out_units = static_cast<const BeU16*>(static_cast<const void*>(data + head_off + 0x12))->value();
out_units =
static_cast<const BeU16*>(static_cast<const void*>(data + head_off + 0x12))->value();
return out_units != 0;
}
@ -3096,7 +3096,6 @@ s32 PS4_SYSV_ABI LibrarySetCharSizeWithDpiStub(void* fontObj, u32 dpi_x, u32 dpi
return ORBIS_FONT_ERROR_FATAL;
}
const auto char_w = static_cast<FT_F26Dot6>(static_cast<s32>(scale_x * 64.0f));
const auto char_h = static_cast<FT_F26Dot6>(static_cast<s32>(scale_y * 64.0f));
if (FT_Set_Char_Size(face, char_w, char_h, dpi_x, dpi_y) != 0) {
@ -3268,8 +3267,7 @@ s32 PS4_SYSV_ABI LibraryComputeLayoutBlockStub(void* fontObj, const void* style_
float hhea_out = 0.0f;
if (const TT_HoriHeader* hhea =
static_cast<const TT_HoriHeader*>(FT_Get_Sfnt_Table(face, ft_sfnt_hhea))) {
const s64 caret_rise_units =
x_shift + static_cast<s64>(hhea->caret_Slope_Rise);
const s64 caret_rise_units = x_shift + static_cast<s64>(hhea->caret_Slope_Rise);
const s32 caret_rise_px = trunc_fixed_16_16_to_int(caret_rise_units * x_scale);
hhea_out = static_cast<float>(caret_rise_px - half_effect_w_px) * kOneOver64;
}
@ -3474,7 +3472,8 @@ s32 PS4_SYSV_ABI LibraryLoadGlyphCachedStub(void* fontObj, u32 glyphIndex, s32 m
(obj->cached_units_y_0x70 == obj->cached_units_x_0x68) && (mode == 0);
auto write_vec88_from_seed_pair_unscaled = [&]() {
const s32 seed_low = static_cast<s32>(static_cast<u32>(obj->layout_seed_pair & 0xFFFFFFFFu));
const s32 seed_low =
static_cast<s32>(static_cast<u32>(obj->layout_seed_pair & 0xFFFFFFFFu));
const s32 seed_high =
static_cast<s32>(static_cast<u32>((obj->layout_seed_pair >> 32) & 0xFFFFFFFFu));
obj->layout_seed_vec[0] = static_cast<u64>(static_cast<s64>(seed_low));