diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c
index 31a24a1887..c8b8df1635 100644
--- a/gfx/drivers/d3d8.c
+++ b/gfx/drivers/d3d8.c
@@ -1597,9 +1597,9 @@ static bool d3d8_frame(void *data, const void *frame,
     * can screenshot, etc. */
    if (video_info->black_frame_insertion)
    {
-      if (!d3d_swap(d3d, d3d->dev) || d3d->needs_restore)
+      if (!d3d8_swap(d3d, d3d->dev) || d3d->needs_restore)
          return true;
-      d3d_clear(d3d->dev, 0, 0, D3DCLEAR_TARGET, 0, 1, 0);
+      d3d8_clear(d3d->dev, 0, 0, D3DCLEAR_TARGET, 0, 1, 0);
    }
 
    if (!d3d8_renderchain_render(
@@ -1619,10 +1619,9 @@ static bool d3d8_frame(void *data, const void *frame,
       d3d8_overlay_render(d3d, video_info, d3d->menu);
 
       d3d->menu_display.offset = 0;
-      d3d_set_vertex_declaration(d3d->dev, d3d->menu_display.decl);
-      d3d_set_stream_source(d3d->dev, 0, d3d->menu_display.buffer, 0, sizeof(Vertex));
+      d3d8_set_stream_source(d3d->dev, 0, d3d->menu_display.buffer, 0, sizeof(Vertex));
 
-      d3d_set_viewports(d3d->dev, &screen_vp);
+      d3d8_set_viewports(d3d->dev, &screen_vp);
       menu_driver_frame(video_info);
    }
 #endif
diff --git a/menu/drivers_display/menu_display_d3d8.c b/menu/drivers_display/menu_display_d3d8.c
index 01d4ea7c4e..208f6b566d 100644
--- a/menu/drivers_display/menu_display_d3d8.c
+++ b/menu/drivers_display/menu_display_d3d8.c
@@ -115,10 +115,9 @@ static void menu_display_d3d8_bind_texture(void *data, d3d_video_t *d3d)
    d3d8_set_sampler_address_v(d3d->dev, 0, D3DTADDRESS_COMM_CLAMP);
    d3d8_set_sampler_minfilter(d3d->dev, 0, D3DTEXF_COMM_LINEAR);
    d3d8_set_sampler_magfilter(d3d->dev, 0, D3DTEXF_COMM_LINEAR);
-   d3d8_set_sampler_mipfilter(d3d->dev, 0, D3DTEXF_COMM_LINEAR);
 }
 
-static void menu_display_d3d_draw(void *data, video_frame_info_t *video_info)
+static void menu_display_d3d8_draw(void *data, video_frame_info_t *video_info)
 {
    unsigned i;
    video_shader_ctx_mvp_t mvp;