From 00add4bb37091bca58aea88af6f177cabd6080ed Mon Sep 17 00:00:00 2001
From: "Joseph C. Osborn" <jcoa2018@pomona.edu>
Date: Sat, 22 Jun 2024 11:13:04 -0700
Subject: [PATCH] Fix build errors on wiiu, directx

---
 gfx/common/d3d9_common.c | 10 +++++-----
 gfx/drivers/gx2_gfx.c    |  6 +-----
 gfx/video_driver.c       |  2 --
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/gfx/common/d3d9_common.c b/gfx/common/d3d9_common.c
index 65f17298eb..c1820fd2db 100644
--- a/gfx/common/d3d9_common.c
+++ b/gfx/common/d3d9_common.c
@@ -1323,10 +1323,10 @@ void d3d9_calculate_rect(d3d9_video_t *d3d,
 
    vp.x = 0;
    vp.y = 0;
-   vp.width = width;
-   vp.height = height;
-   vp.full_width = width;
-   vp.full_height = height;
+   vp.width = *width;
+   vp.height = *height;
+   vp.full_width = *width;
+   vp.full_height = *height;
 
    if (video_scale_integer && !force_full)
    {
@@ -1339,7 +1339,7 @@ void d3d9_calculate_rect(d3d9_video_t *d3d,
    }
    else if (d3d->keep_aspect && !force_full)
    {
-      video_viewport_get_scaled_aspect(vp, viewport_width, viewport_height, true);
+      video_viewport_get_scaled_aspect(&vp, *width, *height, true);
    }
    *x                          = vp.x;
    *y                          = vp.y;
diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c
index 3dbf875804..b144532b50 100644
--- a/gfx/drivers/gx2_gfx.c
+++ b/gfx/drivers/gx2_gfx.c
@@ -923,14 +923,10 @@ static void gx2_set_projection(wiiu_video_t *wiiu)
 
 static void gx2_update_viewport(wiiu_video_t *wiiu)
 {
-   int x                           = 0;
-   int y                           = 0;
    unsigned viewport_width         = wiiu->color_buffer.surface.width;
    unsigned viewport_height        = wiiu->color_buffer.surface.height;
-   float device_aspect             = (float)viewport_width / viewport_height;
    settings_t *settings            = config_get_ptr();
    bool video_scale_integer        = settings->bools.video_scale_integer;
-   unsigned video_aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
 
    if (video_scale_integer)
    {
@@ -942,7 +938,7 @@ static void gx2_update_viewport(wiiu_video_t *wiiu)
    }
    else if (wiiu->keep_aspect)
    {
-      video_viewport_get_scaled_aspect(&vk->vp, viewport_width, viewport_height, true);
+      video_viewport_get_scaled_aspect(&wiiu->vp, viewport_width, viewport_height, true);
    }
    else
    {
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 83193b17ec..048991e70f 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -2113,10 +2113,8 @@ void video_viewport_get_scaled_aspect2(struct video_viewport *vp, unsigned viewp
 void video_driver_update_viewport(
       struct video_viewport* vp, bool force_full, bool keep_aspect)
 {
-   float            device_aspect  = (float)vp->full_width / vp->full_height;
    settings_t *settings            = config_get_ptr();
    bool video_scale_integer        = settings->bools.video_scale_integer;
-   unsigned video_aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
    video_driver_state_t *video_st  = &video_driver_st;
    float video_driver_aspect_ratio = video_st->aspect_ratio;