Merge remote-tracking branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/tests/unit/u_format_test.c
	src/gallium/winsys/r600/drm/r600_hw_context.c

1 files changed, 9 insertions, 7 deletions

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 86ef255cd2e..d442c15c02a 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -372,19 +372,21 @@ struct pipe_resource
    unsigned flags;           /**< bitmask of PIPE_RESOURCE_FLAG_x */
 };
 
+
+/**
+ * Stream output for vertex transform feedback.
+ */
 struct pipe_stream_output_state
 {
-   /**< number of the output buffer to insert each element into */
+   /** number of the output buffer to insert each element into */
    int output_buffer[PIPE_MAX_SHADER_OUTPUTS];
-   /**< which register to grab each output from */
+   /** which register to grab each output from */
    int register_index[PIPE_MAX_SHADER_OUTPUTS];
-   /**< TGSI_WRITEMASK signifying which components to output */
+   /** TGSI_WRITEMASK signifying which components to output */
    ubyte register_mask[PIPE_MAX_SHADER_OUTPUTS];
-   /**< number of outputs */
+   /** number of outputs */
    int num_outputs;
-
-   /**< stride for an entire vertex, only used if all output_buffers
-    * are 0 */
+   /** stride for an entire vertex, only used if all output_buffers are 0 */
    unsigned stride;
 };