diff --git a/src/gallium/state_trackers/dri/common/dri_screen.c b/src/gallium/state_trackers/dri/common/dri_screen.c
index cbd7563..821c1de 100644
--- a/src/gallium/state_trackers/dri/common/dri_screen.c
+++ b/src/gallium/state_trackers/dri/common/dri_screen.c
@@ -344,8 +344,11 @@
    return dri_fill_in_modes(screen, pixel_bits);
 }
 
-#ifndef __NOT_HAVE_DRM_H
-
+/**
+ * DRI driver virtual function table.
+ *
+ * DRI versions differ in their implementation of init_screen and swap_buffers.
+ */
 const struct __DriverAPIRec driDriverAPI = {
    .DestroyScreen = dri_destroy_screen,
    .CreateContext = dri_create_context,
@@ -354,6 +357,9 @@
    .DestroyBuffer = dri_destroy_buffer,
    .MakeCurrent = dri_make_current,
    .UnbindContext = dri_unbind_context,
+
+#ifndef __NOT_HAVE_DRM_H
+
    .GetSwapInfo = dri_get_swap_info,
    .GetDrawableMSC = driDrawableGetMSC32,
    .WaitForMSC = driWaitForMSC32,
@@ -362,23 +368,14 @@
    .InitScreen = dri1_init_screen,
    .SwapBuffers = dri1_swap_buffers,
    .CopySubBuffer = dri1_copy_sub_buffer,
-};
 
 #else
 
-const struct __DriverAPIRec driDriverAPI = {
-   .DestroyScreen = dri_destroy_screen,
-   .CreateContext = dri_create_context,
-   .DestroyContext = dri_destroy_context,
-   .CreateBuffer = dri_create_buffer,
-   .DestroyBuffer = dri_destroy_buffer,
-   .MakeCurrent = dri_make_current,
-   .UnbindContext = dri_unbind_context,
-
    .InitScreen = drisw_init_screen,
    .SwapBuffers = drisw_swap_buffers,
-};
 
 #endif
 
+};
+
 /* vim: set sw=3 ts=8 sts=3 expandtab: */