diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h
index 4d2c96d7e8..d36d5e620f 100644
--- a/gfx/common/d3d9_common.h
+++ b/gfx/common/d3d9_common.h
@@ -56,7 +56,6 @@ typedef struct d3d9_renderchain_driver
          void *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);
-   void (*viewport_info)(d3d9_video_t *d3d, struct video_viewport *vp);
    const char *ident;
 } d3d9_renderchain_driver_t;
 
diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
index bb64bef32f..a352e1d4fc 100644
--- a/gfx/drivers/d3d9.c
+++ b/gfx/drivers/d3d9.c
@@ -395,12 +395,21 @@ static bool d3d9_process_shader(d3d9_video_t *d3d)
 
 static void d3d9_viewport_info(void *data, struct video_viewport *vp)
 {
+   unsigned width, height;
    d3d9_video_t *d3d   = (d3d9_video_t*)data;
 
-   if (  d3d &&
-         d3d->renderchain_driver &&
-         d3d->renderchain_driver->viewport_info)
-      d3d->renderchain_driver->viewport_info(d3d, vp);
+   if (!vp)
+      return;
+
+   video_driver_get_size(&width, &height);
+
+   vp->x            = d3d->final_viewport.x;
+   vp->y            = d3d->final_viewport.y;
+   vp->width        = d3d->final_viewport.width;
+   vp->height       = d3d->final_viewport.height;
+
+   vp->full_width   = width;
+   vp->full_height  = height;
 }
 
 static void d3d9_set_mvp(void *data,
diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
index fbf5631165..b85636a4a3 100644
--- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
@@ -1674,26 +1674,6 @@ end:
    return ret;
 }
 
-static void d3d9_cg_renderchain_viewport_info(
-      d3d9_video_t *d3d,
-      struct video_viewport *vp)
-{
-   unsigned width, height;
-
-   if (!vp)
-      return;
-
-   video_driver_get_size(&width, &height);
-
-   vp->x            = d3d->final_viewport.x;
-   vp->y            = d3d->final_viewport.y;
-   vp->width        = d3d->final_viewport.width;
-   vp->height       = d3d->final_viewport.height;
-
-   vp->full_width   = width;
-   vp->full_height  = height;
-}
-
 d3d9_renderchain_driver_t cg_d3d9_renderchain = {
    d3d9_cg_renderchain_free,
    d3d9_cg_renderchain_new,
@@ -1706,6 +1686,5 @@ d3d9_renderchain_driver_t cg_d3d9_renderchain = {
    d3d9_cg_renderchain_convert_geometry,
    d3d9_cg_renderchain_set_font_rect,
    d3d9_cg_renderchain_read_viewport,
-   d3d9_cg_renderchain_viewport_info,
    "cg_d3d9",
 };
diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
index 92bc992bb8..52875c421f 100644
--- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
@@ -124,8 +124,8 @@ static void hlsl_d3d9_renderchain_set_vertices(
    {
       unsigned i;
       Vertex vert[4];
-	  float tex_w      = 0.0f;
-	  float tex_h      = 0.0f;
+      float tex_w      = 0.0f;
+      float tex_h      = 0.0f;
       void *verts      = NULL;
 
       chain->last_width  = vert_width;
@@ -371,25 +371,6 @@ static void hlsl_d3d9_renderchain_convert_geometry(
    /* stub */
 }
 
-static void hlsl_d3d9_renderchain_viewport_info(
-      d3d9_video_t *d3d, struct video_viewport *vp)
-{
-   unsigned width, height;
-
-   if (!vp)
-      return;
-
-   video_driver_get_size(&width, &height);
-
-   vp->x            = d3d->final_viewport.x;
-   vp->y            = d3d->final_viewport.y;
-   vp->width        = d3d->final_viewport.width;
-   vp->height       = d3d->final_viewport.height;
-
-   vp->full_width   = width;
-   vp->full_height  = height;
-}
-
 d3d9_renderchain_driver_t hlsl_d3d9_renderchain = {
    hlsl_d3d9_renderchain_free,
    hlsl_d3d9_renderchain_new,
@@ -402,6 +383,5 @@ d3d9_renderchain_driver_t hlsl_d3d9_renderchain = {
    hlsl_d3d9_renderchain_convert_geometry,
    NULL,
    NULL,
-   hlsl_d3d9_renderchain_viewport_info,
    "hlsl_d3d9",
 };