diff --git a/src/gallium/auxiliary/vl/vl_video_buffer.c b/src/gallium/auxiliary/vl/vl_video_buffer.c
index 603d2708e2e..7ecd38f5b53 100644
--- a/src/gallium/auxiliary/vl/vl_video_buffer.c
+++ b/src/gallium/auxiliary/vl/vl_video_buffer.c
@@ -71,6 +71,9 @@ vl_get_video_buffer_formats(struct pipe_screen *screen, enum pipe_format format,
 const unsigned *
 vl_video_buffer_plane_order(enum pipe_format format)
 {
+   if (util_format_get_num_planes(format) == 1)
+      return const_resource_plane_order_YUV;
+
    switch(format) {
    case PIPE_FORMAT_YV12:
       return const_resource_plane_order_YVU;
@@ -79,20 +82,9 @@ vl_video_buffer_plane_order(enum pipe_format format)
    case PIPE_FORMAT_NV21:
    case PIPE_FORMAT_Y8_U8_V8_444_UNORM:
    case PIPE_FORMAT_Y8_U8_V8_440_UNORM:
-   case PIPE_FORMAT_R8G8B8A8_UNORM:
-   case PIPE_FORMAT_R8G8B8X8_UNORM:
-   case PIPE_FORMAT_B8G8R8A8_UNORM:
-   case PIPE_FORMAT_B8G8R8X8_UNORM:
-   case PIPE_FORMAT_R10G10B10A2_UNORM:
-   case PIPE_FORMAT_R10G10B10X2_UNORM:
-   case PIPE_FORMAT_B10G10R10A2_UNORM:
-   case PIPE_FORMAT_B10G10R10X2_UNORM:
-   case PIPE_FORMAT_YUYV:
-   case PIPE_FORMAT_UYVY:
    case PIPE_FORMAT_P010:
    case PIPE_FORMAT_P012:
    case PIPE_FORMAT_P016:
-   case PIPE_FORMAT_Y8_400_UNORM:
    case PIPE_FORMAT_IYUV:
       return const_resource_plane_order_YUV;