diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h
index 1a0656695d..5f34b20037 100644
--- a/gfx/common/d3d9_common.h
+++ b/gfx/common/d3d9_common.h
@@ -50,10 +50,10 @@ typedef struct d3d9_renderchain_driver
    void (*add_state_tracker)(void *data, void *tracker_data);
    bool (*render)(d3d9_video_t *d3d, const void *frame,
          unsigned width, unsigned height, unsigned pitch, unsigned rotation);
-   void (*convert_geometry)(void *data, const void *info_data,
+   void (*convert_geometry)(void *data, const struct LinkInfo *info,
          unsigned *out_width, unsigned *out_height,
          unsigned width, unsigned height,
-         void *final_viewport);
+         D3DVIEWPORT9 *final_viewport);
    void (*set_font_rect)(d3d9_video_t *d3d, const void *param_data);
    bool (*read_viewport)(d3d9_video_t *d3d, uint8_t *buffer, bool is_idle);
    const char *ident;
diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
index 5ba146558f..0cb43b05af 100644
--- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
@@ -930,16 +930,14 @@ static bool d3d9_cg_renderchain_set_pass_size(
 
 static void d3d9_cg_renderchain_convert_geometry(
       void *data,
-      const void *info_data,
+      const struct LinkInfo *info,
       unsigned *out_width,
       unsigned *out_height,
       unsigned width,
       unsigned height,
-      void *final_viewport_data)
+      D3DVIEWPORT9 *final_viewport)
 {
-   const struct LinkInfo *info                 = (const struct LinkInfo*)info_data;
    cg_renderchain_t *chain                     = (cg_renderchain_t*)data;
-   D3DVIEWPORT9 *final_viewport                = (D3DVIEWPORT9*)final_viewport_data;
 
    if (!chain || !info)
       return;
diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
index 4d474aa926..4c6f039697 100644
--- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
@@ -202,7 +202,8 @@ static void hlsl_d3d9_renderchain_blit_to_texture(
             0, &d3dlr, NULL, chain->tex_h, D3DLOCK_NOSYSLOCK);
    }
 
-   /* Set the texture to NULL so D3D doesn't complain about it being in use... */
+   /* Set the texture to NULL so D3D doesn't 
+    * complain about it being in use... */
    d3d9_set_texture(chain->dev, 0, NULL);
 
    if (d3d9_lock_rectangle(chain->tex, 0, &d3dlr, NULL, 0, 0))
@@ -351,19 +352,16 @@ static void hlsl_d3d9_renderchain_add_state_tracker(
 }
 
 static void hlsl_d3d9_renderchain_convert_geometry(
-	  void *data, const void *info_data,
+	  void *data, const struct LinkInfo *info,
       unsigned *out_width, unsigned *out_height,
       unsigned width, unsigned height,
-      void *final_viewport_data)
+      D3DVIEWPORT9 *final_viewport)
 {
    (void)data;
-   (void)info_data;
    (void)out_width;
    (void)out_height;
    (void)width;
    (void)height;
-   (void)final_viewport_data;
-
    /* stub */
 }