fixed nitpicks, fixed dx12 not liking pixel fix

shiiion · Apr 12, 2021 · c87eb98 · c87eb98
1 parent 51a5b06
commit c87eb98
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Source/Core/Core/PrimeHack/Mods/FpsControls.cpp b/Source/Core/Core/PrimeHack/Mods/FpsControls.cpp
@@ -66,7 +66,7 @@ void FpsControls::run_mod(Game game, Region region) {
     run_mod_mp1_gc(region);
     break;
   case Game::PRIME_2_GCN:
-    run_mod_mp2_gc();
+    run_mod_mp2_gc(region);
     break;
   default:
     break;
@@ -329,7 +329,7 @@ void FpsControls::run_mod_mp1_gc(Region region) {
   const u32 orbit_state_val = read32(orbit_state);
   if (orbit_state_val != ORBIT_STATE_GRAPPLE &&
     orbit_state_val != 0) {
-    calculate_pitch_locked(Game::PRIME_1_GCN, GetHackManager()->get_active_region());
+    calculate_pitch_locked(Game::PRIME_1_GCN, region);
     LOOKUP_DYN(firstperson_pitch);
     writef32(FpsControls::pitch, firstperson_pitch);
 
@@ -463,7 +463,7 @@ void FpsControls::run_mod_mp2(Region region) {
   }
 }
 
-void FpsControls::run_mod_mp2_gc() {
+void FpsControls::run_mod_mp2_gc(Region region) {
   LOOKUP_DYN(world);
   if (world == 0) {
     return;
@@ -492,7 +492,7 @@ void FpsControls::run_mod_mp2_gc() {
   LOOKUP_DYN(firstperson_pitch);
   if (read32(orbit_state) != ORBIT_STATE_GRAPPLE &&
       read32(orbit_state) != 0) {
-    calculate_pitch_locked(Game::PRIME_2_GCN, GetHackManager()->get_active_region());
+    calculate_pitch_locked(Game::PRIME_2_GCN, region);
     writef32(FpsControls::pitch, firstperson_pitch);
     return;
   }
@@ -598,7 +598,7 @@ void FpsControls::mp3_handle_lasso(u32 grapple_state_addr) {
 
 // this game is
 void FpsControls::run_mod_mp3(Game active_game, Region active_region) {
-  const bool is_mp3_standalone_us = hack_mgr->get_active_game() == Game::PRIME_3_STANDALONE && hack_mgr->get_active_region() == Region::NTSC_U;
+  const bool is_mp3_standalone_us = active_game == Game::PRIME_3_STANDALONE && active_region == Region::NTSC_U;
   CheckBeamVisorSetting(active_game);
 
   if (GrappleCtlBound()) {

diff --git a/Source/Core/Core/PrimeHack/Mods/FpsControls.h b/Source/Core/Core/PrimeHack/Mods/FpsControls.h
@@ -36,7 +36,7 @@ class FpsControls : public PrimeMod {
   void run_mod_mp2(Region region);
   void run_mod_mp3(Game game, Region region);
   void run_mod_mp1_gc(Region region);
-  void run_mod_mp2_gc();
+  void run_mod_mp2_gc(Region region);
 
   void CheckBeamVisorSetting(Game game);
 

diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -1360,10 +1360,10 @@ TextureCacheBase::GetTexture(u32 address, u32 width, u32 height, const TextureFo
       if (!entry)
         return nullptr;
 
-      entry->texture->Load(1, 1, 1, expandedWidth, empty_tex, 4);
+      entry->texture->Load(0, 1, 1, expandedWidth, empty_tex, 4);
 
       entry->SetGeneralParameters(address, texture_size, full_format, false);
-      entry->SetDimensions(1, 1, 1);
+      entry->SetDimensions(1, 1, 0);
       entry->SetHashes(base_hash, full_hash);
       entry->is_custom_tex = true;
       entry->SetNotCopy();