diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index d5d341d689a..2e77fb42a82 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -173,6 +173,12 @@ enum pipe_texture_target {
 #define PIPE_SURFACE        2  /**< user-created surfaces */
 
 
+/**
+ * Surface layout
+ */
+#define PIPE_SURFACE_LAYOUT_LINEAR  0
+
+
 /**
  * Surface status
  */
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 4936b7f5077..571ea8c6e15 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -271,6 +271,7 @@ struct pipe_surface
    unsigned width;
    unsigned height;
    unsigned pitch;               /**< in pixels */
+   unsigned layout;              /**< PIPE_SURFACE_LAYOUT_x */
    unsigned offset;              /**< offset from start of buffer, in bytes */
    unsigned refcount;
    unsigned usage;              /**< PIPE_BUFFER_USAGE_*  */