diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h
index cc07b2083e7..14a2710f7f5 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast.h
@@ -111,12 +111,11 @@ struct lp_rast_shader_inputs {
    unsigned frontfacing:1;      /** True for front-facing */
    unsigned disable:1;          /** Partially binned, disable this command */
    unsigned is_blit:1;          /* blit */
-   unsigned pad0:13;            /* wasted space */
-   unsigned view_index:16;
+   unsigned viewport_index:4;  /* viewport index */
+   unsigned layer:11;
+   unsigned view_index:14;
    unsigned stride;             /* how much to advance data between a0, dadx, dady */
-   unsigned layer;              /* the layer to render to (from gs, already clamped) */
-   unsigned viewport_index;     /* the active viewport index (from gs, already clamped) */
-
+   unsigned pad[2];
    /* followed by a0, dadx, dady and planes[] */
 };