Merge branch 'xenia-canary:canary_experimental' into Custom

.gitmodules

@@ -96,7 +96,7 @@
 	url = https://github.com/p-ranav/tabulate.git
 [submodule "third_party/rapidcsv"]
 	path = third_party/rapidcsv
-	url = https://github.com/d99kris/rapidcsv
+	url = https://github.com/d99kris/rapidcsv.git
 [submodule "third_party/zlib"]
 	path = third_party/zlib
 	url = https://github.com/madler/zlib.git

README.md

@@ -1,6 +1,6 @@
 <p align="center">
     <a href="https://github.com/xenia-canary/xenia-canary/tree/canary_experimental/assets/icon">
-        <img height="120px" src="https://raw.githubusercontent.com/xenia-canary/xenia/master/assets/icon/128.png" />
+        <img height="256px" src="https://raw.githubusercontent.com/xenia-canary/xenia/master/assets/icon/256.png" />
     </a>
 </p>
 

src/xenia/base/cvar.h

@@ -490,7 +490,7 @@ class IConfigVarUpdate {
   // If you're reviewing a pull request with a change here, check if 1) has been
   // done by the submitter before merging.
   static constexpr uint32_t kLastCommittedUpdateDate =
-      MakeConfigVarUpdateDate(2024, 8, 31, 20);
+      MakeConfigVarUpdateDate(2024, 9, 23, 9);
 
   virtual ~IConfigVarUpdate() = default;
 

src/xenia/gpu/gpu_flags.cc

@@ -55,9 +55,10 @@ DEFINE_bool(
     "when MSAA is used with fullscreen passes.",
     "GPU");
 
-DEFINE_int32(query_occlusion_fake_sample_count, 1000,
+DEFINE_int32(query_occlusion_fake_sample_count, 100,
              "If set to -1 no sample counts are written, games may hang. Else, "
              "the sample count of every tile will be incremented on every "
              "EVENT_WRITE_ZPD by this number. Setting this to 0 means "
              "everything is reported as occluded.",
              "GPU");
+UPDATE_from_int32(query_occlusion_fake_sample_count, 2024, 9, 23, 9, 1000);

src/xenia/kernel/util/xlast.cc

@@ -143,18 +143,18 @@ XLast::GetProductInformationAttributes() const {
 }
 
 std::vector<XLanguage> XLast::GetSupportedLanguages() const {
-  std::vector<XLanguage> launguages;
+  std::vector<XLanguage> languages;
 
   std::string xpath = fmt::format(
       "/XboxLiveSubmissionProject/GameConfigProject/LocalizedStrings");
 
   if (!HasXLast()) {
-    return launguages;
+    return languages;
   }
 
   const pugi::xpath_node node = parsed_xlast_->select_node(xpath.c_str());
   if (!node) {
-    return launguages;
+    return languages;
   }
 
   const auto locale = node.node().children("SupportedLocale");
@@ -163,12 +163,12 @@ std::vector<XLanguage> XLast::GetSupportedLanguages() const {
 
     for (const auto& language : language_mapping) {
       if (language.second == locale_name) {
-        launguages.push_back(language.first);
+        languages.push_back(language.first);
       }
     }
   }
 
-  return launguages;
+  return languages;
 }
 
 std::u16string XLast::GetLocalizedString(uint32_t string_id,
@@ -308,15 +308,15 @@ XLastMatchmakingQuery* XLast::GetMatchmakingQuery(
 
 std::vector<uint32_t> XLast::GetAllValuesFromNode(
     const pugi::xpath_node node, const std::string child_name,
-    const std::string attirbute_name) {
+    const std::string attribute_name) {
   std::vector<uint32_t> result{};
 
   const auto searched_child = node.node().child(child_name.c_str());
 
   for (pugi::xml_node_iterator itr = searched_child.begin();
        itr != searched_child.end(); itr++) {
     result.push_back(xe::string_util::from_string<uint32_t>(
-        itr->attribute(attirbute_name.c_str()).value(), true));
+        itr->attribute(attribute_name.c_str()).value(), true));
   }
 
   return result;
@@ -353,4 +353,4 @@ std::string XLast::GetLocaleStringFromLanguage(XLanguage language) const {
 
 }  // namespace util
 }  // namespace kernel
-}  // namespace xe
+}  // namespace xe

src/xenia/kernel/util/xlast.h

@@ -88,7 +88,7 @@ class XLast {
   XLastMatchmakingQuery* GetMatchmakingQuery(uint32_t query_id) const;
   static std::vector<uint32_t> GetAllValuesFromNode(
       const pugi::xpath_node node, const std::string child_name,
-      const std::string attirbute_name);
+      const std::string attribute_name);
 
   void Dump(std::string file_name) const;