diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index d4a680ab038..34af466d685 100644
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -71,6 +71,11 @@ struct glthread_batch
    int used;
 
    /** Data contained in the command buffer. */
+#ifdef _MSC_VER
+   __declspec(align(8))
+#else
+   __attribute__((aligned(8)))
+#endif
    uint8_t buffer[MARSHAL_MAX_CMD_SIZE];
 };