gallium: don't use enum bitfields in p_video_state.h

[mesa.git] / src / gallium / include / pipe / p_video_state.h

diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h
index f46c2dd2bbf892142a4b7e47cb5e0a80bb34b289..2a64ffb560137ce50dc3e6a62d25923517ebb46e 100644 (file)
--- a/src/gallium/include/pipe/p_video_state.h
+++ b/src/gallium/include/pipe/p_video_state.h
@@ -85,18 +85,18 @@ enum pipe_video_mv_weight
 struct pipe_motionvector
 {
    struct {
-      signed x:16, y:16;
-      enum pipe_video_field_select field_select:16;
-      enum pipe_video_mv_weight weight:16;
+      short x, y;
+      ushort field_select; /**< enum pipe_video_field_select */
+      ushort weight;  /**< enum pipe_video_mv_weight  */
    } top, bottom;
 };
 
 /* bitfields because this is used as a vertex buffer element */
 struct pipe_ycbcr_block
 {
-   unsigned x:8, y:8;
-   enum pipe_mpeg12_dct_intra intra:8;
-   enum pipe_mpeg12_dct_type coding:8;
+   ubyte x, y;
+   ubyte intra;  /**< enum pipe_mpeg12_dct_intra */
+   ubyte coding; /**< enum pipe_mpeg12_dct_type */
 };
 
 struct pipe_picture_desc
@@ -113,23 +113,9 @@ struct pipe_mpeg12_picture_desc
    unsigned frame_pred_frame_dct;
    unsigned q_scale_type;
    unsigned alternate_scan;
-   unsigned intra_dc_precision;
    unsigned intra_vlc_format;
    unsigned concealment_motion_vectors;
    unsigned f_code[2][2];
-
-   bool mpeg1;
-   uint8_t *intra_quantizer_matrix;
-   uint8_t *non_intra_quantizer_matrix;
-
-#if 0
-   /* TODO: Use bitfields where possible? */
-   unsigned top_field_first;
-   unsigned full_pel_forward_vector;
-   unsigned full_pel_backward_vector;
-   struct pipe_buffer *chroma_intra_quantizer_matrix;
-   struct pipe_buffer *chroma_non_intra_quantizer_matrix;
-#endif
 };
 
 #ifdef __cplusplus