Improved motion blur at higher framerates, reorganized some patch code

src/game/controls.cpp

@@ -3,8 +3,6 @@
 #include "recomp_helpers.h"
 #include "recomp_input.h"
 #include "../ultramodern/ultramodern.hpp"
-#include "../patches/input.h"
-#include "../patches/graphics.h"
 
 // Arrays that hold the mappings for every input for keyboard and controller respectively.
 using input_mapping = std::array<recomp::InputField, recomp::bindings_per_input>;
@@ -103,36 +101,3 @@ void recomp::get_n64_input(uint16_t* buttons_out, float* x_out, float* y_out) {
     *x_out = std::clamp(cur_x, -1.0f, 1.0f);
     *y_out = std::clamp(cur_y, -1.0f, 1.0f);
 }
-
-extern "C" void recomp_update_inputs(uint8_t* rdram, recomp_context* ctx) {
-    recomp::poll_inputs();
-}
-
-// TODO move these
-extern "C" void recomp_puts(uint8_t* rdram, recomp_context* ctx) {
-    PTR(char) cur_str = _arg<0, PTR(char)>(rdram, ctx);
-    u32 length = _arg<1, u32>(rdram, ctx);
-
-    for (u32 i = 0; i < length; i++) {
-        fputc(MEM_B(i, (gpr)cur_str), stdout);
-    }
-}
-
-extern "C" void recomp_exit(uint8_t* rdram, recomp_context* ctx) {
-    ultramodern::quit();
-}
-
-extern "C" void recomp_get_gyro_deltas(uint8_t* rdram, recomp_context* ctx) {
-    float* x_out = _arg<0, float*>(rdram, ctx);
-    float* y_out = _arg<1, float*>(rdram, ctx);
-
-    recomp::get_gyro_deltas(x_out, y_out);
-}
-
-#include "recomp_ui.h"
-extern "C" void recomp_get_aspect_ratio(uint8_t* rdram, recomp_context* ctx) {
-    int width, height;
-    recomp::get_window_size(width, height);
-
-    _return(ctx, static_cast<float>(width) / height);
-}

src/game/recomp_api.cpp

@@ -0,0 +1,64 @@
+#include <cmath>
+
+#include "recomp.h"
+#include "recomp_input.h"
+#include "recomp_ui.h"
+#include "recomp_helpers.h"
+#include "../patches/input.h"
+#include "../patches/graphics.h"
+#include "../ultramodern/ultramodern.hpp"
+#include "../ultramodern/config.hpp"
+
+extern "C" void recomp_update_inputs(uint8_t* rdram, recomp_context* ctx) {
+    recomp::poll_inputs();
+}
+
+extern "C" void recomp_puts(uint8_t* rdram, recomp_context* ctx) {
+    PTR(char) cur_str = _arg<0, PTR(char)>(rdram, ctx);
+    u32 length = _arg<1, u32>(rdram, ctx);
+
+    for (u32 i = 0; i < length; i++) {
+        fputc(MEM_B(i, (gpr)cur_str), stdout);
+    }
+}
+
+extern "C" void recomp_exit(uint8_t* rdram, recomp_context* ctx) {
+    ultramodern::quit();
+}
+
+extern "C" void recomp_get_gyro_deltas(uint8_t* rdram, recomp_context* ctx) {
+    float* x_out = _arg<0, float*>(rdram, ctx);
+    float* y_out = _arg<1, float*>(rdram, ctx);
+
+    recomp::get_gyro_deltas(x_out, y_out);
+}
+
+extern "C" void recomp_powf(uint8_t* rdram, recomp_context* ctx) {
+    float a = _arg<0, float>(rdram, ctx);
+    float b = ctx->f14.fl; //_arg<1, float>(rdram, ctx);
+
+    _return(ctx, std::powf(a, b));
+}
+
+extern "C" void recomp_get_target_framerate(uint8_t* rdram, recomp_context* ctx) {
+    int frame_divisor = _arg<0, u32>(rdram, ctx);
+
+    _return(ctx, ultramodern::get_target_framerate(60 / frame_divisor));
+}
+
+extern "C" void recomp_get_aspect_ratio(uint8_t* rdram, recomp_context* ctx) {
+    ultramodern::GraphicsConfig graphics_config = ultramodern::get_graphics_config();
+    float original = _arg<0, float>(rdram, ctx);
+    int width, height;
+    recomp::get_window_size(width, height);
+
+    switch (graphics_config.ar_option) {
+        case RT64::UserConfiguration::AspectRatio::Original:
+        default:
+            _return(ctx, original);
+            return;
+        case RT64::UserConfiguration::AspectRatio::Expand:
+            _return(ctx, static_cast<float>(width) / height);
+            return;
+    }
+}

src/recomp/rt64_layer.cpp

@@ -265,3 +265,7 @@ void RT64EnableInstantPresent(RT64::Application* application) {
 RT64::UserConfiguration::Antialiasing RT64MaxMSAA() {
     return device_max_msaa;
 }
+
+uint32_t RT64GetDisplayFramerate(RT64::Application* application) {
+    return application->presentQueue->ext.sharedResources->swapChainRate;
+}