Revert "i965/drv: Pack some structs"

A future MR will properly clean up structs and pack them.

This reverts commit c0673ad.

Author: irql-notlessorequal

.gitignore

@@ -34,5 +34,3 @@ TAGS
 /src/intel_version.h
 /src/wayland-drm-client-protocol.h
 .VERSION*
-.vscode/c_cpp_properties.json
-.vscode/settings.json

src/i965_avc_sw_scoreboard.h

@@ -66,7 +66,7 @@ struct gen_frame_store {
 
 	   This is only used for H.264 decoding on platforms before Haswell */
 	uint64_t    ref_age;
-} __attribute__((packed));
+};
 
 typedef struct gen_frame_store_context GenFrameStoreContext;
 struct gen_frame_store_context {

src/i965_decoder.h

@@ -397,7 +397,7 @@ struct object_surface {
 	VAGenericID wrapper_surface;
 
 	int exported_primefd;
-} __attribute__((packed));
+};
 
 struct object_buffer {
 	struct object_base base;
@@ -413,15 +413,15 @@ struct object_buffer {
 
 	VAGenericID wrapper_buffer;
 	VAContextID context_id;
-} __attribute__((packed));
+};
 
 struct object_image {
 	struct object_base base;
 	VAImage image;
 	dri_bo *bo;
 	unsigned int *palette;
 	VASurfaceID derived_surface;
-} __attribute__((packed));
+};
 
 struct object_subpic {
 	struct object_base base;
@@ -436,7 +436,7 @@ struct object_subpic {
 	float global_alpha;
 	dri_bo *bo;
 	unsigned int flags;
-} __attribute__((packed));
+};
 
 #define I965_RING_NULL  0
 #define I965_RING_BSD   1
@@ -446,7 +446,7 @@ struct object_subpic {
 struct i965_filter {
 	VAProcFilterType type;
 	int ring;
-} __attribute__((packed));
+};
 
 struct i965_driver_data;
 

src/i965_drv_video.h

@@ -480,7 +480,7 @@ struct generic_enc_codec_state {
 	uint32_t min_delta_qp;
 	struct intel_roi roi[INTEL_ROI_NUM];
 
-} __attribute__((packed));
+};
 
 /*
  by now VME and PAK use the same context. it will bind the ctx according to the codec and platform, also vdenc and non-vdenc

src/i965_encoder_common.h

@@ -47,7 +47,7 @@
 typedef struct {
 	uint8_t plane;                      /* the plane which the pixel belongs to */
 	uint8_t offset;                     /* bits offset within a macro-pixel for packed YUV formats or pixel for other formats in the plane */
-} __attribute__((packed)) i965_component_info;
+} i965_component_info;
 
 typedef struct {
 	uint32_t fourcc;                    /* fourcc */
@@ -65,7 +65,7 @@ typedef struct {
 	 * I, A (2 components) for indexed formats
 	 */
 	i965_component_info components[I965_MAX_COMONENTS];
-} __attribute__((packed)) i965_fourcc_info;
+} i965_fourcc_info;
 
 extern const i965_fourcc_info *get_fourcc_info(unsigned int);
 

src/i965_fourcc.h

@@ -90,6 +90,6 @@ struct i965_media_context {
 	void (*media_states_setup)(VADriverContextP ctx, struct decode_state *decode_state, struct i965_media_context *media_context);
 	void (*media_objects)(VADriverContextP ctx, struct decode_state *decode_state, struct i965_media_context *media_context);
 	void (*free_private_context)(void **data);
-} __attribute__((packed));
+};
 
 #endif /* _I965_MEDIA_H_ */

src/i965_media.h

@@ -13,10 +13,6 @@
 #include "i965_media_h264.h"
 #include "i965_decoder_utils.h"
 
-#if defined(I965_ENABLE_CTG_H264)
-#include "i965_avc_sw_scoreboard.h"
-#endif
-
 enum {
 	INTRA_16X16 = 0,
 	INTRA_8X8,
@@ -709,12 +705,6 @@ i965_media_h264_objects(VADriverContextP ctx,
 	assert(media_context->private_context);
 	i965_h264_context = (struct i965_h264_context *)media_context->private_context;
 
-#if defined(I965_ENABLE_CTG_H264)
-	/* issue OBJECT command for software scoreboard befere MC kernels */
-	if (i965_h264_context->is_g4x_context)
-		i965_avc_sw_scoreboard_objects(ctx, i965_h264_context);
-#endif
-
 	dri_bo_map(i965_h264_context->avc_it_command_mb_info.bo, True);
 	assert(i965_h264_context->avc_it_command_mb_info.bo->virtual);
 	object_command = i965_h264_context->avc_it_command_mb_info.bo->virtual;

src/i965_media_h264.c

@@ -45,11 +45,10 @@ struct i965_h264_context {
 		int i_flag;
 	} picture;
 
-	unsigned int is_g4x_context : 1;
-	unsigned int enable_avc_ildb : 1;
-	unsigned int use_avc_hw_scoreboard : 1;
-	unsigned int use_hw_w128 : 1;
+	int enable_avc_ildb;
+	int use_avc_hw_scoreboard;
 
+	int use_hw_w128;
 	unsigned int weight128_luma_l0;
 	unsigned int weight128_luma_l1;
 	unsigned int weight128_chroma_l0;
@@ -66,7 +65,7 @@ struct i965_h264_context {
 
 	struct i965_kernel avc_kernels[NUM_H264_AVC_KERNELS];
 	struct intel_batchbuffer *batch;
-} __attribute__((packed));
+};
 
 void i965_media_h264_decode_init(VADriverContextP ctx, struct decode_state *decode_state, struct i965_media_context *media_context);
 void i965_media_h264_dec_context_init(VADriverContextP ctx, struct i965_media_context *media_context);

src/i965_media_h264.h

@@ -44,7 +44,7 @@ struct i965_mpeg2_context {
 	struct i965_kernel vld_kernels[NUM_MPEG2_VLD_KERNELS];
 	VAIQMatrixBufferMPEG2 iq_matrix;
 	int wa_slice_vertical_position;
-} __attribute__((packed));
+};
 
 void i965_media_mpeg2_decode_init(VADriverContextP ctx, struct decode_state * decode_state, struct i965_media_context *media_context);
 void i965_media_mpeg2_dec_context_init(VADriverContextP ctx, struct i965_media_context *media_context);

src/i965_media_mpeg2.h

@@ -120,7 +120,7 @@ struct i965_render_state {
 								  const VARectangle *src_rec,
 								  const VARectangle *dst_rect);
 	void (*render_terminate)(VADriverContextP ctx);
-} __attribute__((packed));
+};
 
 bool i965_render_init(VADriverContextP ctx);
 void i965_render_terminate(VADriverContextP ctx);