diff --git a/gfx/common/d3d9_common.c b/gfx/common/d3d9_common.c
index 3ae46d7901..445d7ea1d3 100644
--- a/gfx/common/d3d9_common.c
+++ b/gfx/common/d3d9_common.c
@@ -1083,8 +1083,8 @@ void d3d9_overlay_render(d3d9_video_t *d3d,
    IDirect3DDevice9_SetVertexDeclaration(dev, vertex_decl);
    IDirect3DVertexDeclaration9_Release(vertex_decl);
 
-   d3d9_set_stream_source(dev, 0, (LPDIRECT3DVERTEXBUFFER9)overlay->vert_buf,
-         0, sizeof(*vert));
+   IDirect3DDevice9_SetStreamSource(dev, 0,
+         (LPDIRECT3DVERTEXBUFFER9)overlay->vert_buf, 0, sizeof(*vert));
 
    if (overlay->fullscreen)
    {
diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h
index b154bc31cb..6f37501820 100644
--- a/gfx/common/d3d9_common.h
+++ b/gfx/common/d3d9_common.h
@@ -107,19 +107,6 @@ void *d3d9_texture_new(void *dev,
       INT32 color_key, void *src_info,
       PALETTEENTRY *palette, bool want_mipmap);
 
-static INLINE void d3d9_set_stream_source(
-      LPDIRECT3DDEVICE9 dev,
-      unsigned stream_no,
-      LPDIRECT3DVERTEXBUFFER9 stream_vertbuf,
-      unsigned offset_bytes,
-      unsigned stride)
-{
-   if (stream_vertbuf)
-      IDirect3DDevice9_SetStreamSource(dev, stream_no, stream_vertbuf,
-            offset_bytes,
-            stride);
-}
-
 static INLINE bool d3d9_create_vertex_shader(
       LPDIRECT3DDEVICE9 dev, const DWORD *a, void **b)
 {
diff --git a/gfx/drivers/d3d9_renderchain.h b/gfx/drivers/d3d9_renderchain.h
index a9c3c690c2..1d72451a11 100644
--- a/gfx/drivers/d3d9_renderchain.h
+++ b/gfx/drivers/d3d9_renderchain.h
@@ -254,8 +254,7 @@ static INLINE void d3d9_renderchain_unbind_all(d3d9_renderchain_t *chain)
    }
 
    for (i = 0; i < chain->bound_vert->count; i++)
-      d3d9_set_stream_source(chain->dev,
-            chain->bound_vert->data[i], 0, 0, 0);
+      IDirect3DDevice9_SetStreamSource(chain->dev, chain->bound_vert->data[i], 0, 0, 0);
 
    if (chain->bound_tex)
    {
diff --git a/gfx/drivers/d3d9cg.c b/gfx/drivers/d3d9cg.c
index 7a5a6194d7..e2e3973152 100644
--- a/gfx/drivers/d3d9cg.c
+++ b/gfx/drivers/d3d9cg.c
@@ -495,8 +495,8 @@ static void d3d9_cg_renderchain_bind_orig(
          pass->attrib_map;
       unsigned index = attrib_map->data[cgGetParameterResourceIndex(param)];
 
-      d3d9_set_stream_source(chain->dev, index,
-            vert_buf, 0, sizeof(struct D3D9CGVertex));
+      IDirect3DDevice9_SetStreamSource(chain->dev, index, vert_buf, 0,
+sizeof(struct D3D9CGVertex));
       unsigned_vector_list_append(chain->bound_vert, index);
    }
 }
@@ -585,8 +585,8 @@ static void d3d9_cg_renderchain_bind_prev(d3d9_renderchain_t *chain,
          struct unsigned_vector_list *attrib_map = (struct unsigned_vector_list*)pass->attrib_map;
          unsigned index = attrib_map->data[cgGetParameterResourceIndex(param)];
 
-         d3d9_set_stream_source(chain->dev, index,
-               vert_buf, 0, sizeof(struct D3D9CGVertex));
+         IDirect3DDevice9_SetStreamSource(chain->dev, index, vert_buf, 0,
+               sizeof(struct D3D9CGVertex));
          unsigned_vector_list_append(chain->bound_vert, index);
       }
    }
@@ -662,8 +662,9 @@ static void d3d9_cg_renderchain_bind_pass(
             (struct unsigned_vector_list*)pass->attrib_map;
          unsigned index = attrib_map->data[cgGetParameterResourceIndex(param)];
 
-         d3d9_set_stream_source(chain->dev, index, curr_pass->vertex_buf,
-               0, sizeof(struct D3D9CGVertex));
+         IDirect3DDevice9_SetStreamSource(chain->dev, index,
+               cur_pass->vertex_buf, 0,
+               sizeof(struct D3D9CGVertex));
          unsigned_vector_list_append(chain->bound_vert, index);
       }
    }
@@ -1057,9 +1058,8 @@ static void d3d9_cg_renderchain_render_pass(
 
    IDirect3DDevice9_SetVertexDeclaration(chain->dev, pass->vertex_decl);
    for (i = 0; i < 4; i++)
-      d3d9_set_stream_source(chain->dev, i,
-            pass->vertex_buf, 0,
-            sizeof(struct D3D9CGVertex));
+      IDirect3DDevice9_SetStreamSource(chain->dev, i, pass->vertex_buf,
+            0, sizeof(struct D3D9CGVertex));
 
    /* Set orig texture. */
    d3d9_cg_renderchain_bind_orig(chain, chain->dev, pass);
@@ -1855,7 +1855,9 @@ static bool d3d9_cg_frame(void *data, const void *frame,
 
       d3d->menu_display.offset = 0;
       IDirect3DDevice9_SetVertexDeclaration(d3d->dev, (LPDIRECT3DVERTEXDECLARATION9)d3d->menu_display.decl);
-      d3d9_set_stream_source(d3d->dev, 0, (LPDIRECT3DVERTEXBUFFER9)d3d->menu_display.buffer, 0, sizeof(Vertex));
+      IDirect3DDevice9_SetStreamSource(d3d->dev, 0,
+            (LPDIRECT3DVERTEXBUFFER9)d3d->menu_display.buffer,
+            0, sizeof(Vertex));
 
       IDirect3DDevice9_SetViewport(d3d->dev, (D3DVIEWPORT9*)&screen_vp);
       menu_driver_frame(menu_is_alive, video_info);