diff --git a/.gitignore b/.gitignore index e48280767..438fbb9f0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ TAGS .VERSION* # IRQL fork .vscode/c_cpp_properties.json +.vscode/settings.json diff --git a/NEWS b/NEWS index 7ad26d04f..e6bc1bec0 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ Version 2.4.4 - XX.XX.XXXX (IRQL fork) * Minor code cleanup. * Expose ARGB as a surface, attempt two. * Correctly handle VA_RT_FORMAT_YUV422 in GetSubsamplingFromFormat. +* Optimized and cleaned up structs within the codebase. Version 2.4.3 - 12.Mar.2025 (IRQL fork) diff --git a/src/gen10_vdenc_vp9.c b/src/gen10_vdenc_vp9.c index 34b4c5576..304ef8642 100644 --- a/src/gen10_vdenc_vp9.c +++ b/src/gen10_vdenc_vp9.c @@ -51,11 +51,11 @@ static const uint32_t gen10_vdenc_vp9_dys[][4] = { static struct i965_kernel vdenc_vp9_kernels_dys[1] = { { - "dys", - 0, - gen10_vdenc_vp9_dys, - sizeof(gen10_vdenc_vp9_dys), - NULL + .name = "dys", + .interface = 0, + .bin = gen10_vdenc_vp9_dys, + .size = sizeof(gen10_vdenc_vp9_dys), + .bo = NULL }, }; @@ -65,11 +65,11 @@ static const uint32_t gen10_vdenc_vp9_streamin[][4] = { static struct i965_kernel vdenc_vp9_kernels_streamin[1] = { { - "streamin", - 0, - gen10_vdenc_vp9_streamin, - sizeof(gen10_vdenc_vp9_streamin), - NULL + .name = "streamin", + .interface = 0, + .bin = gen10_vdenc_vp9_streamin, + .size = sizeof(gen10_vdenc_vp9_streamin), + .bo = NULL }, }; diff --git a/src/gen6_mfc.c b/src/gen6_mfc.c index ba5b9989b..396dd57ff 100644 --- a/src/gen6_mfc.c +++ b/src/gen6_mfc.c @@ -56,19 +56,19 @@ static const uint32_t gen6_mfc_batchbuffer_avc_inter[][4] = { static struct i965_kernel gen6_mfc_kernels[] = { { - "MFC AVC INTRA BATCHBUFFER ", - MFC_BATCHBUFFER_AVC_INTRA, - gen6_mfc_batchbuffer_avc_intra, - sizeof(gen6_mfc_batchbuffer_avc_intra), - NULL + .name = "MFC AVC INTRA BATCHBUFFER ", + .interface = MFC_BATCHBUFFER_AVC_INTRA, + .bin = gen6_mfc_batchbuffer_avc_intra, + .size = sizeof(gen6_mfc_batchbuffer_avc_intra), + .bo = NULL }, { - "MFC AVC INTER BATCHBUFFER ", - MFC_BATCHBUFFER_AVC_INTER, - gen6_mfc_batchbuffer_avc_inter, - sizeof(gen6_mfc_batchbuffer_avc_inter), - NULL + .name = "MFC AVC INTER BATCHBUFFER ", + .interface = MFC_BATCHBUFFER_AVC_INTER, + .bin = gen6_mfc_batchbuffer_avc_inter, + .size = sizeof(gen6_mfc_batchbuffer_avc_inter), + .bo = NULL }, }; diff --git a/src/gen6_vme.c b/src/gen6_vme.c index e41fffd19..3f00f3afd 100644 --- a/src/gen6_vme.c +++ b/src/gen6_vme.c @@ -74,25 +74,25 @@ static const uint32_t gen6_vme_batchbuffer[][4] = { static struct i965_kernel gen6_vme_kernels[] = { { - "AVC VME Intra Frame", - AVC_VME_INTRA_SHADER, /*index*/ - gen6_vme_intra_frame, - sizeof(gen6_vme_intra_frame), - NULL + .name = "AVC VME Intra Frame", + .interface = AVC_VME_INTRA_SHADER, /*index*/ + .bin = gen6_vme_intra_frame, + .size = sizeof(gen6_vme_intra_frame), + .bo = NULL }, { - "AVC VME inter Frame", - AVC_VME_INTER_SHADER, - gen6_vme_inter_frame, - sizeof(gen6_vme_inter_frame), - NULL + .name = "AVC VME inter Frame", + .interface = AVC_VME_INTER_SHADER, + .bin = gen6_vme_inter_frame, + .size = sizeof(gen6_vme_inter_frame), + .bo = NULL }, { - "AVC VME BATCHBUFFER", - AVC_VME_BATCHBUFFER, - gen6_vme_batchbuffer, - sizeof(gen6_vme_batchbuffer), - NULL + .name = "AVC VME BATCHBUFFER", + .interface = AVC_VME_BATCHBUFFER, + .bin = gen6_vme_batchbuffer, + .size = sizeof(gen6_vme_batchbuffer), + .bo = NULL }, }; diff --git a/src/gen75_mfc.c b/src/gen75_mfc.c index aa47009b8..55c83ecca 100644 --- a/src/gen75_mfc.c +++ b/src/gen75_mfc.c @@ -62,11 +62,11 @@ static const uint32_t gen75_mfc_batchbuffer_avc[][4] = { static struct i965_kernel gen75_mfc_kernels[] = { { - "MFC AVC INTRA BATCHBUFFER ", - MFC_BATCHBUFFER_AVC_INTRA, - gen75_mfc_batchbuffer_avc, - sizeof(gen75_mfc_batchbuffer_avc), - NULL + .name = "MFC AVC INTRA BATCHBUFFER ", + .interface = MFC_BATCHBUFFER_AVC_INTRA, + .bin = gen75_mfc_batchbuffer_avc, + .size = sizeof(gen75_mfc_batchbuffer_avc), + .bo = NULL }, }; diff --git a/src/gen75_vme.c b/src/gen75_vme.c index 919e9eef9..77bee3a75 100644 --- a/src/gen75_vme.c +++ b/src/gen75_vme.c @@ -71,32 +71,32 @@ static const uint32_t gen75_vme_batchbuffer[][4] = { static struct i965_kernel gen75_vme_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen75_vme_intra_frame, - sizeof(gen75_vme_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen75_vme_intra_frame, + .size = sizeof(gen75_vme_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen75_vme_inter_frame, - sizeof(gen75_vme_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen75_vme_inter_frame, + .size = sizeof(gen75_vme_inter_frame), + .bo = NULL }, { - "VME BATCHBUFFER", - VME_BATCHBUFFER, - gen75_vme_batchbuffer, - sizeof(gen75_vme_batchbuffer), - NULL + .name = "VME BATCHBUFFER", + .interface = VME_BATCHBUFFER, + .bin = gen75_vme_batchbuffer, + .size = sizeof(gen75_vme_batchbuffer), + .bo = NULL }, { - "VME inter BFrame", - VME_BINTER_SHADER, - gen75_vme_inter_bframe, - sizeof(gen75_vme_inter_bframe), - NULL + .name = "VME inter BFrame", + .interface = VME_BINTER_SHADER, + .bin = gen75_vme_inter_bframe, + .size = sizeof(gen75_vme_inter_bframe), + .bo = NULL } }; @@ -114,25 +114,25 @@ static const uint32_t gen75_vme_mpeg2_batchbuffer[][4] = { static struct i965_kernel gen75_vme_mpeg2_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen75_vme_mpeg2_intra_frame, - sizeof(gen75_vme_mpeg2_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen75_vme_mpeg2_intra_frame, + .size = sizeof(gen75_vme_mpeg2_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen75_vme_mpeg2_inter_frame, - sizeof(gen75_vme_mpeg2_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen75_vme_mpeg2_inter_frame, + .size = sizeof(gen75_vme_mpeg2_inter_frame), + .bo = NULL }, { - "VME BATCHBUFFER", - VME_BATCHBUFFER, - gen75_vme_mpeg2_batchbuffer, - sizeof(gen75_vme_mpeg2_batchbuffer), - NULL + .name = "VME BATCHBUFFER", + .interface = VME_BATCHBUFFER, + .bin = gen75_vme_mpeg2_batchbuffer, + .size = sizeof(gen75_vme_mpeg2_batchbuffer), + .bo = NULL }, }; diff --git a/src/gen75_vpp_gpe.c b/src/gen75_vpp_gpe.c index 339b1704e..7a2f32909 100644 --- a/src/gen75_vpp_gpe.c +++ b/src/gen75_vpp_gpe.c @@ -63,25 +63,25 @@ static const unsigned int gen75_gpe_sharpening_unmask[][4] = { }; static struct i965_kernel gen75_vpp_sharpening_kernels[] = { { - "vpp: sharpening(horizontal blur)", - VPP_GPE_SHARPENING, - gen75_gpe_sharpening_h_blur, - sizeof(gen75_gpe_sharpening_h_blur), - NULL + .name = "vpp: sharpening(horizontal blur)", + .interface = VPP_GPE_SHARPENING, + .bin = gen75_gpe_sharpening_h_blur, + .size = sizeof(gen75_gpe_sharpening_h_blur), + .bo = NULL }, { - "vpp: sharpening(vertical blur)", - VPP_GPE_SHARPENING, - gen75_gpe_sharpening_v_blur, - sizeof(gen75_gpe_sharpening_v_blur), - NULL + .name = "vpp: sharpening(vertical blur)", + .interface = VPP_GPE_SHARPENING, + .bin = gen75_gpe_sharpening_v_blur, + .size = sizeof(gen75_gpe_sharpening_v_blur), + .bo = NULL }, { - "vpp: sharpening(unmask)", - VPP_GPE_SHARPENING, - gen75_gpe_sharpening_unmask, - sizeof(gen75_gpe_sharpening_unmask), - NULL + .name = "vpp: sharpening(unmask)", + .interface = VPP_GPE_SHARPENING, + .bin = gen75_gpe_sharpening_unmask, + .size = sizeof(gen75_gpe_sharpening_unmask), + .bo = NULL }, }; @@ -98,25 +98,25 @@ static const unsigned int gen8_gpe_sharpening_unmask[][4] = { static struct i965_kernel gen8_vpp_sharpening_kernels[] = { { - "vpp: sharpening(horizontal blur)", - VPP_GPE_SHARPENING, - gen8_gpe_sharpening_h_blur, - sizeof(gen8_gpe_sharpening_h_blur), - NULL + .name = "vpp: sharpening(horizontal blur)", + .interface = VPP_GPE_SHARPENING, + .bin = gen8_gpe_sharpening_h_blur, + .size = sizeof(gen8_gpe_sharpening_h_blur), + .bo = NULL }, { - "vpp: sharpening(vertical blur)", - VPP_GPE_SHARPENING, - gen8_gpe_sharpening_v_blur, - sizeof(gen8_gpe_sharpening_v_blur), - NULL + .name = "vpp: sharpening(vertical blur)", + .interface = VPP_GPE_SHARPENING, + .bin = gen8_gpe_sharpening_v_blur, + .size = sizeof(gen8_gpe_sharpening_v_blur), + .bo = NULL }, { - "vpp: sharpening(unmask)", - VPP_GPE_SHARPENING, - gen8_gpe_sharpening_unmask, - sizeof(gen8_gpe_sharpening_unmask), - NULL + .name = "vpp: sharpening(unmask)", + .interface = VPP_GPE_SHARPENING, + .bin = gen8_gpe_sharpening_unmask, + .size = sizeof(gen8_gpe_sharpening_unmask), + .bo = NULL }, }; diff --git a/src/gen7_mfc.c b/src/gen7_mfc.c index c32ae7f6b..2f82e53fa 100644 --- a/src/gen7_mfc.c +++ b/src/gen7_mfc.c @@ -82,19 +82,19 @@ static const uint32_t gen7_mfc_batchbuffer_avc_inter[][4] = { static struct i965_kernel gen7_mfc_kernels[] = { { - "MFC AVC INTRA BATCHBUFFER ", - MFC_BATCHBUFFER_AVC_INTRA, - gen7_mfc_batchbuffer_avc_intra, - sizeof(gen7_mfc_batchbuffer_avc_intra), - NULL + .name = "MFC AVC INTRA BATCHBUFFER ", + .interface = MFC_BATCHBUFFER_AVC_INTRA, + .bin = gen7_mfc_batchbuffer_avc_intra, + .size = sizeof(gen7_mfc_batchbuffer_avc_intra), + .bo = NULL }, { - "MFC AVC INTER BATCHBUFFER ", - MFC_BATCHBUFFER_AVC_INTER, - gen7_mfc_batchbuffer_avc_inter, - sizeof(gen7_mfc_batchbuffer_avc_inter), - NULL + .name = "MFC AVC INTER BATCHBUFFER ", + .interface = MFC_BATCHBUFFER_AVC_INTER, + .bin = gen7_mfc_batchbuffer_avc_inter, + .size = sizeof(gen7_mfc_batchbuffer_avc_inter), + .bo = NULL }, }; diff --git a/src/gen7_mfd.h b/src/gen7_mfd.h index 99d808884..5b27d4ba6 100644 --- a/src/gen7_mfd.h +++ b/src/gen7_mfd.h @@ -75,7 +75,8 @@ struct gen7_vc1_surface { struct hw_context; -struct gen7_mfd_context { +struct gen7_mfd_context +{ struct hw_context base; union { @@ -95,13 +96,14 @@ struct gen7_mfd_context { GenBuffer segmentation_buffer; VASurfaceID jpeg_wa_surface_id; - struct object_surface *jpeg_wa_surface_object; - dri_bo *jpeg_wa_slice_data_bo; - unsigned int decoder_format_mode : 1; int wa_mpeg2_slice_vertical_position; + struct object_surface *jpeg_wa_surface_object; + dri_bo *jpeg_wa_slice_data_bo; void *driver_context; + + bool decoder_format_mode; }; static VAConfigAttrib *gen7_lookup_config_attribute(struct object_config *obj_config, VAConfigAttribType type) diff --git a/src/gen7_vme.c b/src/gen7_vme.c index f06f6d5da..c5636877d 100644 --- a/src/gen7_vme.c +++ b/src/gen7_vme.c @@ -93,32 +93,32 @@ static const uint32_t gen7_vme_binter_frame[][4] = { static struct i965_kernel gen7_vme_kernels[] = { { - "AVC VME Intra Frame", - AVC_VME_INTRA_SHADER, /*index*/ - gen7_vme_intra_frame, - sizeof(gen7_vme_intra_frame), - NULL + .name = "AVC VME Intra Frame", + .interface = AVC_VME_INTRA_SHADER, /*index*/ + .bin = gen7_vme_intra_frame, + .size = sizeof(gen7_vme_intra_frame), + .bo = NULL }, { - "AVC VME inter Frame", - AVC_VME_INTER_SHADER, - gen7_vme_inter_frame, - sizeof(gen7_vme_inter_frame), - NULL + .name = "AVC VME inter Frame", + .interface = AVC_VME_INTER_SHADER, + .bin = gen7_vme_inter_frame, + .size = sizeof(gen7_vme_inter_frame), + .bo = NULL }, { - "AVC VME BATCHBUFFER", - AVC_VME_BATCHBUFFER, - gen7_vme_batchbuffer, - sizeof(gen7_vme_batchbuffer), - NULL + .name = "AVC VME BATCHBUFFER", + .interface = AVC_VME_BATCHBUFFER, + .bin = gen7_vme_batchbuffer, + .size = sizeof(gen7_vme_batchbuffer), + .bo = NULL }, { - "AVC VME binter Frame", - AVC_VME_BINTER_SHADER, - gen7_vme_binter_frame, - sizeof(gen7_vme_binter_frame), - NULL + .name = "AVC VME binter Frame", + .interface = AVC_VME_BINTER_SHADER, + .bin = gen7_vme_binter_frame, + .size = sizeof(gen7_vme_binter_frame), + .bo = NULL } }; @@ -132,18 +132,18 @@ static const uint32_t gen7_vme_mpeg2_batchbuffer[][4] = { static struct i965_kernel gen7_vme_mpeg2_kernels[] = { { - "MPEG2 VME inter Frame", - MPEG2_VME_INTER_SHADER, - gen7_vme_mpeg2_inter_frame, - sizeof(gen7_vme_mpeg2_inter_frame), - NULL + .name = "MPEG2 VME inter Frame", + .interface = MPEG2_VME_INTER_SHADER, + .bin = gen7_vme_mpeg2_inter_frame, + .size = sizeof(gen7_vme_mpeg2_inter_frame), + .bo = NULL }, { - "MPEG2 VME BATCHBUFFER", - MPEG2_VME_BATCHBUFFER, - gen7_vme_mpeg2_batchbuffer, - sizeof(gen7_vme_mpeg2_batchbuffer), - NULL + .name = "MPEG2 VME BATCHBUFFER", + .interface = MPEG2_VME_BATCHBUFFER, + .bin = gen7_vme_mpeg2_batchbuffer, + .size = sizeof(gen7_vme_mpeg2_batchbuffer), + .bo = NULL }, }; diff --git a/src/gen8_mfc.c b/src/gen8_mfc.c index 7d55b78d7..b9ee20acc 100644 --- a/src/gen8_mfc.c +++ b/src/gen8_mfc.c @@ -112,21 +112,21 @@ static const uint32_t gen9_mfc_batchbuffer_avc[][4] = { static struct i965_kernel gen8_mfc_kernels[] = { { - "MFC AVC INTRA BATCHBUFFER ", - MFC_BATCHBUFFER_AVC_INTRA, - gen8_mfc_batchbuffer_avc, - sizeof(gen8_mfc_batchbuffer_avc), - NULL + .name = "MFC AVC INTRA BATCHBUFFER ", + .interface = MFC_BATCHBUFFER_AVC_INTRA, + .bin = gen8_mfc_batchbuffer_avc, + .size = sizeof(gen8_mfc_batchbuffer_avc), + .bo = NULL }, }; static struct i965_kernel gen9_mfc_kernels[] = { { - "MFC AVC INTRA BATCHBUFFER ", - MFC_BATCHBUFFER_AVC_INTRA, - gen9_mfc_batchbuffer_avc, - sizeof(gen9_mfc_batchbuffer_avc), - NULL + .name = "MFC AVC INTRA BATCHBUFFER ", + .interface = MFC_BATCHBUFFER_AVC_INTRA, + .bin = gen9_mfc_batchbuffer_avc, + .size = sizeof(gen9_mfc_batchbuffer_avc), + .bo = NULL }, }; diff --git a/src/gen8_post_processing.c b/src/gen8_post_processing.c index 23b3a98f0..335b70c2a 100644 --- a/src/gen8_post_processing.c +++ b/src/gen8_post_processing.c @@ -131,11 +131,11 @@ static const uint32_t pp_nv12_load_save_rgbx_gen8[][4] = { static struct pp_module pp_modules_gen8[] = { { { - "NULL module (for testing)", - PP_NULL, - pp_null_gen8, - sizeof(pp_null_gen8), - NULL, + .name = "NULL module (for testing)", + .interface = PP_NULL, + .bin = pp_null_gen8, + .size = sizeof(pp_null_gen8), + .bo = NULL, }, pp_null_initialize, @@ -143,11 +143,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "NV12_NV12", - PP_NV12_LOAD_SAVE_N12, - pp_nv12_load_save_nv12_gen8, - sizeof(pp_nv12_load_save_nv12_gen8), - NULL, + .name = "NV12_NV12", + .interface = PP_NV12_LOAD_SAVE_N12, + .bin = pp_nv12_load_save_nv12_gen8, + .size = sizeof(pp_nv12_load_save_nv12_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -155,22 +155,22 @@ static struct pp_module pp_modules_gen8[] = { { { - "NV12_PL3", - PP_NV12_LOAD_SAVE_PL3, - pp_nv12_load_save_pl3_gen8, - sizeof(pp_nv12_load_save_pl3_gen8), - NULL, + .name = "NV12_PL3", + .interface = PP_NV12_LOAD_SAVE_PL3, + .bin = pp_nv12_load_save_pl3_gen8, + .size = sizeof(pp_nv12_load_save_pl3_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, }, { { - "PL3_NV12", - PP_PL3_LOAD_SAVE_N12, - pp_pl3_load_save_nv12_gen8, - sizeof(pp_pl3_load_save_nv12_gen8), - NULL, + .name = "PL3_NV12", + .interface = PP_PL3_LOAD_SAVE_N12, + .bin = pp_pl3_load_save_nv12_gen8, + .size = sizeof(pp_pl3_load_save_nv12_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -178,11 +178,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "PL3_PL3", - PP_PL3_LOAD_SAVE_PL3, - pp_pl3_load_save_pl3_gen8, - sizeof(pp_pl3_load_save_pl3_gen8), - NULL, + .name = "PL3_PL3", + .interface = PP_PL3_LOAD_SAVE_PL3, + .bin = pp_pl3_load_save_pl3_gen8, + .size = sizeof(pp_pl3_load_save_pl3_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -190,11 +190,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "NV12 Scaling module", - PP_NV12_SCALING, - pp_nv12_scaling_gen8, - sizeof(pp_nv12_scaling_gen8), - NULL, + .name = "NV12 Scaling module", + .interface = PP_NV12_SCALING, + .bin = pp_nv12_scaling_gen8, + .size = sizeof(pp_nv12_scaling_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -202,11 +202,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "NV12 AVS module", - PP_NV12_AVS, - pp_nv12_avs_gen8, - sizeof(pp_nv12_avs_gen8), - NULL, + .name = "NV12 AVS module", + .interface = PP_NV12_AVS, + .bin = pp_nv12_avs_gen8, + .size = sizeof(pp_nv12_avs_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -214,11 +214,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "NV12 DNDI module", - PP_NV12_DNDI, - pp_nv12_dndi_gen8, - sizeof(pp_nv12_dndi_gen8), - NULL, + .name = "NV12 DNDI module", + .interface = PP_NV12_DNDI, + .bin = pp_nv12_dndi_gen8, + .size = sizeof(pp_nv12_dndi_gen8), + .bo = NULL, }, pp_null_initialize, @@ -226,22 +226,22 @@ static struct pp_module pp_modules_gen8[] = { { { - "NV12 DN module", - PP_NV12_DN, - pp_nv12_dn_gen8, - sizeof(pp_nv12_dn_gen8), - NULL, + .name = "NV12 DN module", + .interface = PP_NV12_DN, + .bin = pp_nv12_dn_gen8, + .size = sizeof(pp_nv12_dn_gen8), + .bo = NULL, }, pp_null_initialize, }, { { - "NV12_PA module", - PP_NV12_LOAD_SAVE_PA, - pp_nv12_load_save_pa_gen8, - sizeof(pp_nv12_load_save_pa_gen8), - NULL, + .name = "NV12_PA module", + .interface = PP_NV12_LOAD_SAVE_PA, + .bin = pp_nv12_load_save_pa_gen8, + .size = sizeof(pp_nv12_load_save_pa_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -249,11 +249,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "PL3_PA module", - PP_PL3_LOAD_SAVE_PA, - pp_pl3_load_save_pa_gen8, - sizeof(pp_pl3_load_save_pa_gen8), - NULL, + .name = "PL3_PA module", + .interface = PP_PL3_LOAD_SAVE_PA, + .bin = pp_pl3_load_save_pa_gen8, + .size = sizeof(pp_pl3_load_save_pa_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -261,11 +261,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "PA_NV12 module", - PP_PA_LOAD_SAVE_NV12, - pp_pa_load_save_nv12_gen8, - sizeof(pp_pa_load_save_nv12_gen8), - NULL, + .name = "PA_NV12 module", + .interface = PP_PA_LOAD_SAVE_NV12, + .bin = pp_pa_load_save_nv12_gen8, + .size = sizeof(pp_pa_load_save_nv12_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -273,11 +273,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "PA_PL3 module", - PP_PA_LOAD_SAVE_PL3, - pp_pa_load_save_pl3_gen8, - sizeof(pp_pa_load_save_pl3_gen8), - NULL, + .name = "PA_PL3 module", + .interface = PP_PA_LOAD_SAVE_PL3, + .bin = pp_pa_load_save_pl3_gen8, + .size = sizeof(pp_pa_load_save_pl3_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -285,11 +285,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "PA_PA module", - PP_PA_LOAD_SAVE_PA, - pp_pa_load_save_pa_gen8, - sizeof(pp_pa_load_save_pa_gen8), - NULL, + .name = "PA_PA module", + .interface = PP_PA_LOAD_SAVE_PA, + .bin = pp_pa_load_save_pa_gen8, + .size = sizeof(pp_pa_load_save_pa_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -297,11 +297,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "RGBX_NV12 module", - PP_RGBX_LOAD_SAVE_NV12, - pp_rgbx_load_save_nv12_gen8, - sizeof(pp_rgbx_load_save_nv12_gen8), - NULL, + .name = "RGBX_NV12 module", + .interface = PP_RGBX_LOAD_SAVE_NV12, + .bin = pp_rgbx_load_save_nv12_gen8, + .size = sizeof(pp_rgbx_load_save_nv12_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -309,11 +309,11 @@ static struct pp_module pp_modules_gen8[] = { { { - "NV12_RGBX module", - PP_NV12_LOAD_SAVE_RGBX, - pp_nv12_load_save_rgbx_gen8, - sizeof(pp_nv12_load_save_rgbx_gen8), - NULL, + .name = "NV12_RGBX module", + .interface = PP_NV12_LOAD_SAVE_RGBX, + .bin = pp_nv12_load_save_rgbx_gen8, + .size = sizeof(pp_nv12_load_save_rgbx_gen8), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -334,19 +334,19 @@ static const uint32_t pp_8bit_420_rgb32_scaling_gen8[][4] = { struct i965_kernel pp_common_scaling_gen8[] = { { - "8bit to 8bit", - 0, - pp_yuv420p8_scaling_gen8, - sizeof(pp_yuv420p8_scaling_gen8), - NULL, + .name = "8bit to 8bit", + .interface = 0, + .bin = pp_yuv420p8_scaling_gen8, + .size = sizeof(pp_yuv420p8_scaling_gen8), + .bo = NULL, }, { - "8bit 420 to rgb32", - 1, - pp_8bit_420_rgb32_scaling_gen8, - sizeof(pp_8bit_420_rgb32_scaling_gen8), - NULL, + .name = "8bit 420 to rgb32", + .interface = 1, + .bin = pp_8bit_420_rgb32_scaling_gen8, + .size = sizeof(pp_8bit_420_rgb32_scaling_gen8), + .bo = NULL, }, }; diff --git a/src/gen8_render.c b/src/gen8_render.c index 42b870f91..341d2b8b4 100644 --- a/src/gen8_render.c +++ b/src/gen8_render.c @@ -92,34 +92,34 @@ enum { static struct i965_kernel render_kernels_gen8[] = { { - "SF", - SF_KERNEL, - sf_kernel_static_gen8, - sizeof(sf_kernel_static_gen8), - NULL + .name = "SF", + .interface = SF_KERNEL, + .bin = sf_kernel_static_gen8, + .size = sizeof(sf_kernel_static_gen8), + .bo = NULL }, { - "PS", - PS_KERNEL, - ps_kernel_static_gen8, - sizeof(ps_kernel_static_gen8), - NULL + .name = "PS", + .interface = PS_KERNEL, + .bin = ps_kernel_static_gen8, + .size = sizeof(ps_kernel_static_gen8), + .bo = NULL }, { - "PS_SUBPIC", - PS_SUBPIC_KERNEL, - ps_subpic_kernel_static_gen8, - sizeof(ps_subpic_kernel_static_gen8), - NULL + .name = "PS_SUBPIC", + .interface = PS_SUBPIC_KERNEL, + .bin = ps_subpic_kernel_static_gen8, + .size = sizeof(ps_subpic_kernel_static_gen8), + .bo = NULL }, { - "PS_CLEAR", - PS_CLEAR_KERNEL, - ps_clear_kernel_static_gen8, - sizeof(ps_clear_kernel_static_gen8), - NULL + .name = "PS_CLEAR", + .interface = PS_CLEAR_KERNEL, + .bin = ps_clear_kernel_static_gen8, + .size = sizeof(ps_clear_kernel_static_gen8), + .bo = NULL } }; diff --git a/src/gen8_vme.c b/src/gen8_vme.c index b05201ee1..9cdae26bf 100644 --- a/src/gen8_vme.c +++ b/src/gen8_vme.c @@ -74,25 +74,25 @@ static const uint32_t gen8_vme_inter_bframe[][4] = { static struct i965_kernel gen8_vme_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen8_vme_intra_frame, - sizeof(gen8_vme_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen8_vme_intra_frame, + .size = sizeof(gen8_vme_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen8_vme_inter_frame, - sizeof(gen8_vme_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen8_vme_inter_frame, + .size = sizeof(gen8_vme_inter_frame), + .bo = NULL }, { - "VME inter BFrame", - VME_BINTER_SHADER, - gen8_vme_inter_bframe, - sizeof(gen8_vme_inter_bframe), - NULL + .name = "VME inter BFrame", + .interface = VME_BINTER_SHADER, + .bin = gen8_vme_inter_bframe, + .size = sizeof(gen8_vme_inter_bframe), + .bo = NULL } }; @@ -106,18 +106,18 @@ static const uint32_t gen8_vme_mpeg2_inter_frame[][4] = { static struct i965_kernel gen8_vme_mpeg2_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen8_vme_mpeg2_intra_frame, - sizeof(gen8_vme_mpeg2_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen8_vme_mpeg2_intra_frame, + .size = sizeof(gen8_vme_mpeg2_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen8_vme_mpeg2_inter_frame, - sizeof(gen8_vme_mpeg2_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen8_vme_mpeg2_inter_frame, + .size = sizeof(gen8_vme_mpeg2_inter_frame), + .bo = NULL }, }; @@ -131,18 +131,18 @@ static const uint32_t gen8_vme_vp8_inter_frame[][4] = { static struct i965_kernel gen8_vme_vp8_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen8_vme_vp8_intra_frame, - sizeof(gen8_vme_vp8_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen8_vme_vp8_intra_frame, + .size = sizeof(gen8_vme_vp8_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen8_vme_vp8_inter_frame, - sizeof(gen8_vme_vp8_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen8_vme_vp8_inter_frame, + .size = sizeof(gen8_vme_vp8_inter_frame), + .bo = NULL }, }; diff --git a/src/gen9_post_processing.c b/src/gen9_post_processing.c index 3aa180b40..9c07a0918 100644 --- a/src/gen9_post_processing.c +++ b/src/gen9_post_processing.c @@ -126,46 +126,46 @@ static const uint32_t pp_8bit_420_rgb32_scaling_gen9[][4] = { struct i965_kernel pp_common_scaling_gen9[] = { { - "10bit to 10bit", - 0, - pp_10bit_scaling_gen9, - sizeof(pp_10bit_scaling_gen9), - NULL, + .name = "10bit to 10bit", + .interface = 0, + .bin = pp_10bit_scaling_gen9, + .size = sizeof(pp_10bit_scaling_gen9), + .bo = NULL, }, { - "8bit to 8bit", - 1, - pp_yuv420p8_scaling_gen9, - sizeof(pp_yuv420p8_scaling_gen9), - NULL, + .name = "8bit to 8bit", + .interface = 1, + .bin = pp_yuv420p8_scaling_gen9, + .size = sizeof(pp_yuv420p8_scaling_gen9), + .bo = NULL, }, { - "10bit to 8bit", - 2, - pp_10bit_8bit_scaling_gen9, - sizeof(pp_10bit_8bit_scaling_gen9), - NULL, + .name = "10bit to 8bit", + .interface = 2, + .bin = pp_10bit_8bit_scaling_gen9, + .size = sizeof(pp_10bit_8bit_scaling_gen9), + .bo = NULL, }, { - "8bit 420 to rgb32", - 3, - pp_8bit_420_rgb32_scaling_gen9, - sizeof(pp_8bit_420_rgb32_scaling_gen9), - NULL, + .name = "8bit 420 to rgb32", + .interface = 3, + .bin = pp_8bit_420_rgb32_scaling_gen9, + .size = sizeof(pp_8bit_420_rgb32_scaling_gen9), + .bo = NULL, }, }; static struct pp_module pp_modules_gen9[] = { { { - "NULL module (for testing)", - PP_NULL, - pp_null_gen9, - sizeof(pp_null_gen9), - NULL, + .name = "NULL module (for testing)", + .interface = PP_NULL, + .bin = pp_null_gen9, + .size = sizeof(pp_null_gen9), + .bo = NULL, }, pp_null_initialize, @@ -173,11 +173,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "NV12_NV12", - PP_NV12_LOAD_SAVE_N12, - pp_nv12_load_save_nv12_gen9, - sizeof(pp_nv12_load_save_nv12_gen9), - NULL, + .name = "NV12_NV12", + .interface = PP_NV12_LOAD_SAVE_N12, + .bin = pp_nv12_load_save_nv12_gen9, + .size = sizeof(pp_nv12_load_save_nv12_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -185,22 +185,22 @@ static struct pp_module pp_modules_gen9[] = { { { - "NV12_PL3", - PP_NV12_LOAD_SAVE_PL3, - pp_nv12_load_save_pl3_gen9, - sizeof(pp_nv12_load_save_pl3_gen9), - NULL, + .name = "NV12_PL3", + .interface = PP_NV12_LOAD_SAVE_PL3, + .bin = pp_nv12_load_save_pl3_gen9, + .size = sizeof(pp_nv12_load_save_pl3_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, }, { { - "PL3_NV12", - PP_PL3_LOAD_SAVE_N12, - pp_pl3_load_save_nv12_gen9, - sizeof(pp_pl3_load_save_nv12_gen9), - NULL, + .name = "PL3_NV12", + .interface = PP_PL3_LOAD_SAVE_N12, + .bin = pp_pl3_load_save_nv12_gen9, + .size = sizeof(pp_pl3_load_save_nv12_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -208,11 +208,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "PL3_PL3", - PP_PL3_LOAD_SAVE_PL3, - pp_pl3_load_save_pl3_gen9, - sizeof(pp_pl3_load_save_pl3_gen9), - NULL, + .name = "PL3_PL3", + .interface = PP_PL3_LOAD_SAVE_PL3, + .bin = pp_pl3_load_save_pl3_gen9, + .size = sizeof(pp_pl3_load_save_pl3_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -220,11 +220,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "NV12 Scaling module", - PP_NV12_SCALING, - pp_nv12_scaling_gen9, - sizeof(pp_nv12_scaling_gen9), - NULL, + .name = "NV12 Scaling module", + .interface = PP_NV12_SCALING, + .bin = pp_nv12_scaling_gen9, + .size = sizeof(pp_nv12_scaling_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -232,11 +232,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "NV12 AVS module", - PP_NV12_AVS, - pp_nv12_avs_gen9, - sizeof(pp_nv12_avs_gen9), - NULL, + .name = "NV12 AVS module", + .interface = PP_NV12_AVS, + .bin = pp_nv12_avs_gen9, + .size = sizeof(pp_nv12_avs_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -244,11 +244,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "NV12 DNDI module", - PP_NV12_DNDI, - pp_nv12_dndi_gen9, - sizeof(pp_nv12_dndi_gen9), - NULL, + .name = "NV12 DNDI module", + .interface = PP_NV12_DNDI, + .bin = pp_nv12_dndi_gen9, + .size = sizeof(pp_nv12_dndi_gen9), + .bo = NULL, }, pp_null_initialize, @@ -256,22 +256,22 @@ static struct pp_module pp_modules_gen9[] = { { { - "NV12 DN module", - PP_NV12_DN, - pp_nv12_dn_gen9, - sizeof(pp_nv12_dn_gen9), - NULL, + .name = "NV12 DN module", + .interface = PP_NV12_DN, + .bin = pp_nv12_dn_gen9, + .size = sizeof(pp_nv12_dn_gen9), + .bo = NULL, }, pp_null_initialize, }, { { - "NV12_PA module", - PP_NV12_LOAD_SAVE_PA, - pp_nv12_load_save_pa_gen9, - sizeof(pp_nv12_load_save_pa_gen9), - NULL, + .name = "NV12_PA module", + .interface = PP_NV12_LOAD_SAVE_PA, + .bin = pp_nv12_load_save_pa_gen9, + .size = sizeof(pp_nv12_load_save_pa_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -279,11 +279,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "PL3_PA module", - PP_PL3_LOAD_SAVE_PA, - pp_pl3_load_save_pa_gen9, - sizeof(pp_pl3_load_save_pa_gen9), - NULL, + .name = "PL3_PA module", + .interface = PP_PL3_LOAD_SAVE_PA, + .bin = pp_pl3_load_save_pa_gen9, + .size = sizeof(pp_pl3_load_save_pa_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -291,11 +291,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "PA_NV12 module", - PP_PA_LOAD_SAVE_NV12, - pp_pa_load_save_nv12_gen9, - sizeof(pp_pa_load_save_nv12_gen9), - NULL, + .name = "PA_NV12 module", + .interface = PP_PA_LOAD_SAVE_NV12, + .bin = pp_pa_load_save_nv12_gen9, + .size = sizeof(pp_pa_load_save_nv12_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -303,11 +303,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "PA_PL3 module", - PP_PA_LOAD_SAVE_PL3, - pp_pa_load_save_pl3_gen9, - sizeof(pp_pa_load_save_pl3_gen9), - NULL, + .name = "PA_PL3 module", + .interface = PP_PA_LOAD_SAVE_PL3, + .bin = pp_pa_load_save_pl3_gen9, + .size = sizeof(pp_pa_load_save_pl3_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -315,11 +315,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "PA_PA module", - PP_PA_LOAD_SAVE_PA, - pp_pa_load_save_pa_gen9, - sizeof(pp_pa_load_save_pa_gen9), - NULL, + .name = "PA_PA module", + .interface = PP_PA_LOAD_SAVE_PA, + .bin = pp_pa_load_save_pa_gen9, + .size = sizeof(pp_pa_load_save_pa_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -327,11 +327,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "RGBX_NV12 module", - PP_RGBX_LOAD_SAVE_NV12, - pp_rgbx_load_save_nv12_gen9, - sizeof(pp_rgbx_load_save_nv12_gen9), - NULL, + .name = "RGBX_NV12 module", + .interface = PP_RGBX_LOAD_SAVE_NV12, + .bin = pp_rgbx_load_save_nv12_gen9, + .size = sizeof(pp_rgbx_load_save_nv12_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, @@ -339,11 +339,11 @@ static struct pp_module pp_modules_gen9[] = { { { - "NV12_RGBX module", - PP_NV12_LOAD_SAVE_RGBX, - pp_nv12_load_save_rgbx_gen9, - sizeof(pp_nv12_load_save_rgbx_gen9), - NULL, + .name = "NV12_RGBX module", + .interface = PP_NV12_LOAD_SAVE_RGBX, + .bin = pp_nv12_load_save_rgbx_gen9, + .size = sizeof(pp_nv12_load_save_rgbx_gen9), + .bo = NULL, }, gen8_pp_plx_avs_initialize, diff --git a/src/gen9_render.c b/src/gen9_render.c index 71afddb3b..94e9a7835 100644 --- a/src/gen9_render.c +++ b/src/gen9_render.c @@ -86,34 +86,34 @@ enum { static struct i965_kernel render_kernels_gen9[] = { { - "SF", - SF_KERNEL, - sf_kernel_static_gen9, - sizeof(sf_kernel_static_gen9), - NULL + .name = "SF", + .interface = SF_KERNEL, + .bin = sf_kernel_static_gen9, + .size = sizeof(sf_kernel_static_gen9), + .bo = NULL }, { - "PS", - PS_KERNEL, - ps_kernel_static_gen9, - sizeof(ps_kernel_static_gen9), - NULL + .name = "PS", + .interface = PS_KERNEL, + .bin = ps_kernel_static_gen9, + .size = sizeof(ps_kernel_static_gen9), + .bo = NULL }, { - "PS_SUBPIC", - PS_SUBPIC_KERNEL, - ps_subpic_kernel_static_gen9, - sizeof(ps_subpic_kernel_static_gen9), - NULL + .name = "PS_SUBPIC", + .interface = PS_SUBPIC_KERNEL, + .bin = ps_subpic_kernel_static_gen9, + .size = sizeof(ps_subpic_kernel_static_gen9), + .bo = NULL }, { - "PS_CLEAR", - PS_CLEAR_KERNEL, - ps_clear_kernel_static_gen9, - sizeof(ps_clear_kernel_static_gen9), - NULL + .name = "PS_CLEAR", + .interface = PS_CLEAR_KERNEL, + .bin = ps_clear_kernel_static_gen9, + .size = sizeof(ps_clear_kernel_static_gen9), + .bo = NULL } }; diff --git a/src/gen9_vme.c b/src/gen9_vme.c index fb8beb4c8..f3dcd163a 100644 --- a/src/gen9_vme.c +++ b/src/gen9_vme.c @@ -78,25 +78,25 @@ static const uint32_t gen9_vme_inter_bframe[][4] = { static struct i965_kernel gen9_vme_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen9_vme_intra_frame, - sizeof(gen9_vme_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen9_vme_intra_frame, + .size = sizeof(gen9_vme_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen9_vme_inter_frame, - sizeof(gen9_vme_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen9_vme_inter_frame, + .size = sizeof(gen9_vme_inter_frame), + .bo = NULL }, { - "VME inter BFrame", - VME_BINTER_SHADER, - gen9_vme_inter_bframe, - sizeof(gen9_vme_inter_bframe), - NULL + .name = "VME inter BFrame", + .interface = VME_BINTER_SHADER, + .bin = gen9_vme_inter_bframe, + .size = sizeof(gen9_vme_inter_bframe), + .bo = NULL } }; @@ -110,18 +110,18 @@ static const uint32_t gen9_vme_mpeg2_inter_frame[][4] = { static struct i965_kernel gen9_vme_mpeg2_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen9_vme_mpeg2_intra_frame, - sizeof(gen9_vme_mpeg2_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen9_vme_mpeg2_intra_frame, + .size = sizeof(gen9_vme_mpeg2_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen9_vme_mpeg2_inter_frame, - sizeof(gen9_vme_mpeg2_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen9_vme_mpeg2_inter_frame, + .size = sizeof(gen9_vme_mpeg2_inter_frame), + .bo = NULL }, }; @@ -135,18 +135,18 @@ static const uint32_t gen9_vme_vp8_inter_frame[][4] = { static struct i965_kernel gen9_vme_vp8_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen9_vme_vp8_intra_frame, - sizeof(gen9_vme_vp8_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen9_vme_vp8_intra_frame, + .size = sizeof(gen9_vme_vp8_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen9_vme_vp8_inter_frame, - sizeof(gen9_vme_vp8_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen9_vme_vp8_inter_frame, + .size = sizeof(gen9_vme_vp8_inter_frame), + .bo = NULL }, }; @@ -166,25 +166,25 @@ static const uint32_t gen9_vme_hevc_inter_bframe[][4] = { static struct i965_kernel gen9_vme_hevc_kernels[] = { { - "VME Intra Frame", - VME_INTRA_SHADER, /*index*/ - gen9_vme_hevc_intra_frame, - sizeof(gen9_vme_hevc_intra_frame), - NULL + .name = "VME Intra Frame", + .interface = VME_INTRA_SHADER, /*index*/ + .bin = gen9_vme_hevc_intra_frame, + .size = sizeof(gen9_vme_hevc_intra_frame), + .bo = NULL }, { - "VME inter Frame", - VME_INTER_SHADER, - gen9_vme_hevc_inter_frame, - sizeof(gen9_vme_hevc_inter_frame), - NULL + .name = "VME inter Frame", + .interface = VME_INTER_SHADER, + .bin = gen9_vme_hevc_inter_frame, + .size = sizeof(gen9_vme_hevc_inter_frame), + .bo = NULL }, { - "VME inter BFrame", - VME_BINTER_SHADER, - gen9_vme_hevc_inter_bframe, - sizeof(gen9_vme_hevc_inter_bframe), - NULL + .name = "VME inter BFrame", + .interface = VME_BINTER_SHADER, + .bin = gen9_vme_hevc_inter_bframe, + .size = sizeof(gen9_vme_hevc_inter_bframe), + .bo = NULL } }; /* only used for VME source surface state */ diff --git a/src/i965_avc_encoder.h b/src/i965_avc_encoder.h index 36a0fc8cb..a68002281 100644 --- a/src/i965_avc_encoder.h +++ b/src/i965_avc_encoder.h @@ -286,8 +286,15 @@ struct generic_search_path_delta { uint8_t search_path_delta_y: 4; }; -struct scaling_param { +struct scaling_param +{ VASurfaceID curr_pic; + + bool use_4x_scaling; + bool use_16x_scaling; + bool use_32x_scaling; + bool blk8x8_stat_enabled; + void *p_scaling_bti; struct object_surface *input_surface; struct object_surface *output_surface; @@ -303,10 +310,6 @@ struct scaling_param { bool enable_mb_flatness_check; bool enable_mb_variance_output; bool enable_mb_pixel_average_output; - bool use_4x_scaling; - bool use_16x_scaling; - bool use_32x_scaling; - bool blk8x8_stat_enabled; struct i965_gpe_resource *pres_mbv_proc_stat_buffer; struct i965_gpe_resource *pres_flatness_check_surface; }; diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h index 1a4ea6448..a2aa2ac77 100644 --- a/src/i965_drv_video.h +++ b/src/i965_drv_video.h @@ -187,12 +187,13 @@ struct i965_surface { int flags; }; -struct i965_kernel { +struct i965_kernel +{ char *name; - int interface; + dri_bo *bo; const uint32_t (*bin)[4]; + int interface; int size; - dri_bo *bo; unsigned int kernel_offset; }; @@ -306,11 +307,11 @@ struct encode_state { struct object_surface *reference_objects[16]; /* Up to 2 reference surfaces are valid for MPEG-2,*/ }; -struct proc_state { +struct proc_state +{ struct codec_state_base base; - struct buffer_store *pipeline_param; - VASurfaceID current_render_target; + struct buffer_store *pipeline_param; }; #define CODEC_DEC 0 @@ -358,10 +359,14 @@ struct object_context { #define SURFACE_ALL_MASK ((SURFACE_REFERENCED) | \ (SURFACE_DERIVED)) -struct object_surface { +struct object_surface +{ struct object_base base; VASurfaceStatus status; VASubpictureID subpic[I965_MAX_SUBPIC_SUM]; + + VAGenericID wrapper_surface; + struct object_subpic *obj_subpic[I965_MAX_SUBPIC_SUM]; unsigned int subpic_render_idx; @@ -376,6 +381,8 @@ struct object_surface { unsigned int expected_format; VAImageID locked_image_id; VAImageID derived_image_id; + int exported_primefd; + void (*free_private_data)(void **data); void *private_data; unsigned int subsampling; @@ -393,26 +400,23 @@ struct object_surface { /* we need clear right and bottom border for NV12. * to avoid encode run to run issue*/ uint32_t border_cleared : 1; - - VAGenericID wrapper_surface; - - int exported_primefd; }; -struct object_buffer { +struct object_buffer +{ struct object_base base; struct buffer_store *buffer_store; int max_num_elements; int num_elements; int size_element; VABufferType type; + VAContextID context_id; /* Export state */ unsigned int export_refcount; VABufferInfo export_state; VAGenericID wrapper_buffer; - VAContextID context_id; }; struct object_image { @@ -423,7 +427,8 @@ struct object_image { VASurfaceID derived_surface; }; -struct object_subpic { +struct object_subpic +{ struct object_base base; VAImageID image; struct object_image *obj_image; @@ -434,8 +439,9 @@ struct object_subpic { int height; int pitch; float global_alpha; - dri_bo *bo; unsigned int flags; + + dri_bo *bo; }; #define I965_RING_NULL 0 diff --git a/src/i965_encoder.h b/src/i965_encoder.h index 91a2fb72e..a7977db82 100644 --- a/src/i965_encoder.h +++ b/src/i965_encoder.h @@ -43,7 +43,7 @@ #define WIDTH_IN_MACROBLOCKS(width) (ALIGN(width, 16) >> 4) #define HEIGHT_IN_MACROBLOCKS(height) (ALIGN(height, 16) >> 4) -#define MAX_TEMPORAL_LAYERS 4 +#define MAX_TEMPORAL_LAYERS 4 struct intel_roi { short left; @@ -59,7 +59,8 @@ struct intel_fraction { unsigned int den; }; -struct intel_encoder_context { +struct intel_encoder_context +{ struct hw_context base; VADriverContextP ctx; int codec; @@ -113,13 +114,12 @@ struct intel_encoder_context { unsigned int context_roi : 1; unsigned int is_new_sequence : 1; /* Currently only valid for H.264, TODO for other codecs */ - unsigned int fei_enabled : 1; - unsigned int fei_function_mode; /* configured VA_FEI_FUNCTION_XXX */ - unsigned int preenc_enabled : 1; - unsigned int hw_rate_control : 1; /* "MbRateCtrlFlag- RateControlCounterEnable" */ + unsigned int fei_enabled : 1; + unsigned int fei_function_mode; /* configured VA_FEI_FUNCTION_XXX */ + void (*vme_context_destroy)(void *vme_context); VAStatus(*vme_pipeline)(VADriverContextP ctx, VAProfile profile, diff --git a/src/i965_encoder_common.h b/src/i965_encoder_common.h index 8fe1b675e..d70715385 100644 --- a/src/i965_encoder_common.h +++ b/src/i965_encoder_common.h @@ -485,12 +485,14 @@ struct generic_enc_codec_state { /* 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 */ -struct encoder_vme_mfc_context { +struct encoder_vme_mfc_context +{ + void *generic_enc_ctx; + void *private_enc_ctx; //pointer to the specific enc_ctx + void *generic_enc_state; + void *private_enc_state; //pointer to the specific enc_state + int32_t codec_id; - void * generic_enc_ctx; - void * private_enc_ctx; //pointer to the specific enc_ctx - void * generic_enc_state; - void * private_enc_state; //pointer to the specific enc_state }; #endif /* _I965_COMMON_ENCODER_H */ diff --git a/src/i965_encoder_vp8.c b/src/i965_encoder_vp8.c index d48269c7f..ff0c35286 100644 --- a/src/i965_encoder_vp8.c +++ b/src/i965_encoder_vp8.c @@ -60,119 +60,119 @@ struct i965_kernel vp8_kernels_brc_init_reset[NUM_VP8_BRC_RESET] = { { - "VP8 BRC Init", - VP8_BRC_INIT, - NULL, - 0, - NULL + .name = "VP8 BRC Init", + .interface = VP8_BRC_INIT, + .bin = NULL, + .size = 0, + .bo = NULL }, { - "VP8 BRC Reset", - VP8_BRC_RESET, - NULL, - 0, - NULL + .name = "VP8 BRC Reset", + .interface = VP8_BRC_RESET, + .bin = NULL, + .size = 0, + .bo = NULL }, }; struct i965_kernel vp8_kernels_scaling[NUM_VP8_SCALING] = { { - "VP8 SCALE 4X", - VP8_SCALING_4X, - NULL, - 0, - NULL + .name = "VP8 SCALE 4X", + .interface = VP8_SCALING_4X, + .bin = NULL, + .size = 0, + .bo = NULL }, { - "VP8 SCALE 16", - VP8_SCALING_16X, - NULL, - 0, - NULL + .name = "VP8 SCALE 16", + .interface = VP8_SCALING_16X, + .bin = NULL, + .size = 0, + .bo = NULL }, }; struct i965_kernel vp8_kernels_me[NUM_VP8_ME] = { { - "VP8 ME 4X", - VP8_ME_4X, - NULL, - 0, - NULL + .name = "VP8 ME 4X", + .interface = VP8_ME_4X, + .bin = NULL, + .size = 0, + .bo = NULL }, { - "VP8 ME 16", - VP8_ME_16X, - NULL, - 0, - NULL + .name = "VP8 ME 16", + .interface = VP8_ME_16X, + .bin = NULL, + .size = 0, + .bo = NULL }, }; struct i965_kernel vp8_kernels_mbenc[NUM_VP8_MBENC] = { { - "VP8 MBEnc I Frame Dist", - VP8_MBENC_I_FRAME_DIST, - NULL, - 0, - NULL + .name = "VP8 MBEnc I Frame Dist", + .interface = VP8_MBENC_I_FRAME_DIST, + .bin = NULL, + .size = 0, + .bo = NULL }, { - "VP8 MBEnc I Frame Luma", - VP8_MBENC_I_FRAME_LUMA, - NULL, - 0, - NULL + .name = "VP8 MBEnc I Frame Luma", + .interface = VP8_MBENC_I_FRAME_LUMA, + .bin = NULL, + .size = 0, + .bo = NULL }, { - "VP8 MBEnc I Frame Chroma", - VP8_MBENC_I_FRAME_CHROMA, - NULL, - 0, - NULL + .name = "VP8 MBEnc I Frame Chroma", + .interface = VP8_MBENC_I_FRAME_CHROMA, + .bin = NULL, + .size = 0, + .bo = NULL }, { - "VP8 MBEnc P Frame", - VP8_MBENC_P_FRAME, - NULL, - 0, - NULL + .name = "VP8 MBEnc P Frame", + .interface = VP8_MBENC_P_FRAME, + .bin = NULL, + .size = 0, + .bo = NULL }, }; struct i965_kernel vp8_kernels_mpu[NUM_VP8_MPU] = { { - "VP8 MPU", - VP8_MPU, - NULL, - 0, - NULL + .name = "VP8 MPU", + .interface = VP8_MPU, + .bin = NULL, + .size = 0, + .bo = NULL }, }; struct i965_kernel vp8_kernels_tpu[NUM_VP8_TPU] = { { - "VP8 TPU", - VP8_TPU, - NULL, - 0, - NULL + .name = "VP8 TPU", + .interface = VP8_TPU, + .bin = NULL, + .size = 0, + .bo = NULL }, }; struct i965_kernel vp8_kernels_brc_update[NUM_VP8_BRC_UPDATE] = { { - "VP8 BRC Update", - VP8_BRC_UPDATE, - NULL, - 0, - NULL + .name = "VP8 BRC Update", + .interface = VP8_BRC_UPDATE, + .bin = NULL, + .size = 0, + .bo = NULL }, }; @@ -3772,8 +3772,8 @@ static VAStatus i965_encoder_vp8_vme_mbenc(VADriverContextP ctx, struct encode_state *encode_state, struct intel_encoder_context *encoder_context, - int is_phase2, - int is_iframe_dist) + bool is_phase2, + bool is_iframe_dist) { struct i965_encoder_vp8_context *vp8_context = encoder_context->vme_context; struct i965_encoder_vp8_mbenc_context *mbenc_context = &vp8_context->mbenc_context; diff --git a/src/i965_encoder_vp8.h b/src/i965_encoder_vp8.h index 954d516bf..dca889ca4 100644 --- a/src/i965_encoder_vp8.h +++ b/src/i965_encoder_vp8.h @@ -89,12 +89,14 @@ struct encode_state; struct intel_encoder_context; -struct i965_encoder_vp8_surface { +struct i965_encoder_vp8_surface +{ VADriverContextP ctx; - VASurfaceID scaled_4x_surface_id; struct object_surface *scaled_4x_surface_obj; - VASurfaceID scaled_16x_surface_id; struct object_surface *scaled_16x_surface_obj; + + VASurfaceID scaled_4x_surface_id; + VASurfaceID scaled_16x_surface_id; unsigned int qp_index; }; @@ -672,9 +674,10 @@ struct i965_encoder_vp8_me_context { #define DC_BIAS_SEGMENT_DEFAULT_VAL_VP8 1500 -struct mbenc_surface_parameters { - int i_frame_dist_in_use; +struct mbenc_surface_parameters +{ struct i965_gpe_resource *me_brc_distortion_buffer; + bool i_frame_dist_in_use; }; enum vp8_binding_table_offset_mbenc { @@ -2240,19 +2243,21 @@ enum VP8_ENCODER_WALKER_DEGREE { VP8_ENCODER_45Z_DEGREE }; -struct vp8_encoder_kernel_walker_parameter { - unsigned int walker_degree; - unsigned int use_scoreboard; - unsigned int scoreboard_mask; - unsigned int no_dependency; - unsigned int resolution_x; - unsigned int resolution_y; +struct vp8_encoder_kernel_walker_parameter +{ + unsigned int walker_degree; + unsigned int scoreboard_mask; + unsigned int resolution_x; + unsigned int resolution_y; + bool use_scoreboard; + bool no_dependency; }; -struct vp8_encoder_scoreboard_parameters { - unsigned int mask; - unsigned int type; - unsigned int enable; +struct vp8_encoder_scoreboard_parameters +{ + unsigned int mask; + unsigned int type; + bool enable; }; #define VP8_BRC_HISTORY_BUFFER_SIZE 704 diff --git a/src/i965_gpe_utils.h b/src/i965_gpe_utils.h index 4e7592363..1c5bea044 100644 --- a/src/i965_gpe_utils.h +++ b/src/i965_gpe_utils.h @@ -219,9 +219,10 @@ struct gpe_mi_load_register_reg_parameter { unsigned int dst_mmio_offset; }; -struct gpe_mi_math_parameter { - unsigned int num_instructions; +struct gpe_mi_math_parameter +{ unsigned int *instruction_list; + unsigned int num_instructions; }; struct gpe_mi_conditional_batch_buffer_end_parameter { @@ -518,14 +519,16 @@ enum walker_degree { WALKER_26Z_DEGREE, WALKER_45Z_DEGREE, }; -struct gpe_encoder_kernel_walker_parameter { +struct gpe_encoder_kernel_walker_parameter +{ unsigned int walker_degree; - unsigned int use_scoreboard; unsigned int scoreboard_mask; - unsigned int no_dependency; unsigned int resolution_x; unsigned int resolution_y; - unsigned int use_vertical_raster_scan; + + bool no_dependency; + bool use_scoreboard; + bool use_vertical_raster_scan; /* UNUSED? */ }; extern void diff --git a/src/i965_media_h264.c b/src/i965_media_h264.c index fd1ed5f88..19e743fc4 100644 --- a/src/i965_media_h264.c +++ b/src/i965_media_h264.c @@ -162,19 +162,19 @@ static const uint32_t h264_avc_null_gen4[][4] = { static struct i965_kernel h264_avc_kernels_gen4[] = { { - "AVC combined kernel", - H264_AVC_COMBINED, - h264_avc_combined_gen4, - sizeof(h264_avc_combined_gen4), - NULL + .name = "AVC combined kernel", + .interface = H264_AVC_COMBINED, + .bin = h264_avc_combined_gen4, + .size = sizeof(h264_avc_combined_gen4), + .bo = NULL }, { - "NULL kernel", - H264_AVC_NULL, - h264_avc_null_gen4, - sizeof(h264_avc_null_gen4), - NULL + .name = "NULL kernel", + .interface = H264_AVC_NULL, + .bin = h264_avc_null_gen4, + .size = sizeof(h264_avc_null_gen4), + .bo = NULL } }; @@ -257,19 +257,19 @@ static const uint32_t h264_avc_null_gen5[][4] = { static struct i965_kernel h264_avc_kernels_gen5[] = { { - "AVC combined kernel", - H264_AVC_COMBINED, - h264_avc_combined_gen5, - sizeof(h264_avc_combined_gen5), - NULL + .name = "AVC combined kernel", + .interface = H264_AVC_COMBINED, + .bin = h264_avc_combined_gen5, + .size = sizeof(h264_avc_combined_gen5), + .bo = NULL }, { - "NULL kernel", - H264_AVC_NULL, - h264_avc_null_gen5, - sizeof(h264_avc_null_gen5), - NULL + .name = "NULL kernel", + .interface = H264_AVC_NULL, + .bin = h264_avc_null_gen5, + .size = sizeof(h264_avc_null_gen5), + .bo = NULL } }; diff --git a/src/i965_media_h264.h b/src/i965_media_h264.h index 9b0b8d624..52f7da0d9 100644 --- a/src/i965_media_h264.h +++ b/src/i965_media_h264.h @@ -23,7 +23,8 @@ enum { #define NUM_H264_AVC_KERNELS 2 -struct i965_h264_context { +struct i965_h264_context +{ struct { dri_bo *bo; unsigned int mbs; @@ -45,10 +46,11 @@ struct i965_h264_context { int i_flag; } picture; - int enable_avc_ildb; - int use_avc_hw_scoreboard; + bool is_g4x_context; + bool enable_avc_ildb; + bool use_avc_hw_scoreboard; + bool use_hw_w128; - int use_hw_w128; unsigned int weight128_luma_l0; unsigned int weight128_luma_l1; unsigned int weight128_chroma_l0; diff --git a/src/i965_media_mpeg2.c b/src/i965_media_mpeg2.c index b40cb6dcc..770475bcc 100644 --- a/src/i965_media_mpeg2.c +++ b/src/i965_media_mpeg2.c @@ -160,123 +160,123 @@ static const uint32_t field_bidirect_16x8_kernel[][4] = { static struct i965_kernel mpeg2_vld_kernels_gen4[] = { { - "FRAME_INTRA", - FRAME_INTRA, - frame_intra_kernel, - sizeof(frame_intra_kernel), - NULL + .name = "FRAME_INTRA", + .interface = FRAME_INTRA, + .bin = frame_intra_kernel, + .size = sizeof(frame_intra_kernel), + .bo = NULL }, { - "FRAME_FRAME_PRED_FORWARD", - FRAME_FRAME_PRED_FORWARD, - frame_frame_pred_forward_kernel, - sizeof(frame_frame_pred_forward_kernel), - NULL + .name = "FRAME_FRAME_PRED_FORWARD", + .interface = FRAME_FRAME_PRED_FORWARD, + .bin = frame_frame_pred_forward_kernel, + .size = sizeof(frame_frame_pred_forward_kernel), + .bo = NULL }, { - "FRAME_FRAME_PRED_BACKWARD", - FRAME_FRAME_PRED_BACKWARD, - frame_frame_pred_backward_kernel, - sizeof(frame_frame_pred_backward_kernel), - NULL + .name = "FRAME_FRAME_PRED_BACKWARD", + .interface = FRAME_FRAME_PRED_BACKWARD, + .bin = frame_frame_pred_backward_kernel, + .size = sizeof(frame_frame_pred_backward_kernel), + .bo = NULL }, { - "FRAME_FRAME_PRED_BIDIRECT", - FRAME_FRAME_PRED_BIDIRECT, - frame_frame_pred_bidirect_kernel, - sizeof(frame_frame_pred_bidirect_kernel), - NULL + .name = "FRAME_FRAME_PRED_BIDIRECT", + .interface = FRAME_FRAME_PRED_BIDIRECT, + .bin = frame_frame_pred_bidirect_kernel, + .size = sizeof(frame_frame_pred_bidirect_kernel), + .bo = NULL }, { - "FRAME_FIELD_PRED_FORWARD", - FRAME_FIELD_PRED_FORWARD, - frame_field_pred_forward_kernel, - sizeof(frame_field_pred_forward_kernel), - NULL + .name = "FRAME_FIELD_PRED_FORWARD", + .interface = FRAME_FIELD_PRED_FORWARD, + .bin = frame_field_pred_forward_kernel, + .size = sizeof(frame_field_pred_forward_kernel), + .bo = NULL }, { - "FRAME_FIELD_PRED_BACKWARD", - FRAME_FIELD_PRED_BACKWARD, - frame_field_pred_backward_kernel, - sizeof(frame_field_pred_backward_kernel), - NULL + .name = "FRAME_FIELD_PRED_BACKWARD", + .interface = FRAME_FIELD_PRED_BACKWARD, + .bin = frame_field_pred_backward_kernel, + .size = sizeof(frame_field_pred_backward_kernel), + .bo = NULL }, { - "FRAME_FIELD_PRED_BIDIRECT", - FRAME_FIELD_PRED_BIDIRECT, - frame_field_pred_bidirect_kernel, - sizeof(frame_field_pred_bidirect_kernel), - NULL + .name = "FRAME_FIELD_PRED_BIDIRECT", + .interface = FRAME_FIELD_PRED_BIDIRECT, + .bin = frame_field_pred_bidirect_kernel, + .size = sizeof(frame_field_pred_bidirect_kernel), + .bo = NULL }, { - "LIB", - LIB_INTERFACE, - lib_kernel, - sizeof(lib_kernel), - NULL + .name = "LIB", + .interface = LIB_INTERFACE, + .bin = lib_kernel, + .size = sizeof(lib_kernel), + .bo = NULL }, { - "FIELD_INTRA", - FIELD_INTRA, - field_intra_kernel, - sizeof(field_intra_kernel), - NULL + .name = "FIELD_INTRA", + .interface = FIELD_INTRA, + .bin = field_intra_kernel, + .size = sizeof(field_intra_kernel), + .bo = NULL }, { - "FIELD_FORWARD", - FIELD_FORWARD, - field_forward_kernel, - sizeof(field_forward_kernel), - NULL + .name = "FIELD_FORWARD", + .interface = FIELD_FORWARD, + .bin = field_forward_kernel, + .size = sizeof(field_forward_kernel), + .bo = NULL }, { - "FIELD_FORWARD_16X8", - FIELD_FORWARD_16X8, - field_forward_16x8_kernel, - sizeof(field_forward_16x8_kernel), - NULL + .name = "FIELD_FORWARD_16X8", + .interface = FIELD_FORWARD_16X8, + .bin = field_forward_16x8_kernel, + .size = sizeof(field_forward_16x8_kernel), + .bo = NULL }, { - "FIELD_BACKWARD", - FIELD_BACKWARD, - field_backward_kernel, - sizeof(field_backward_kernel), - NULL + .name = "FIELD_BACKWARD", + .interface = FIELD_BACKWARD, + .bin = field_backward_kernel, + .size = sizeof(field_backward_kernel), + .bo = NULL }, { - "FIELD_BACKWARD_16X8", - FIELD_BACKWARD_16X8, - field_backward_16x8_kernel, - sizeof(field_backward_16x8_kernel), - NULL + .name = "FIELD_BACKWARD_16X8", + .interface = FIELD_BACKWARD_16X8, + .bin = field_backward_16x8_kernel, + .size = sizeof(field_backward_16x8_kernel), + .bo = NULL }, { - "FIELD_BIDIRECT", - FIELD_BIDIRECT, - field_bidirect_kernel, - sizeof(field_bidirect_kernel), - NULL + .name = "FIELD_BIDIRECT", + .interface = FIELD_BIDIRECT, + .bin = field_bidirect_kernel, + .size = sizeof(field_bidirect_kernel), + .bo = NULL }, { - "FIELD_BIDIRECT_16X8", - FIELD_BIDIRECT_16X8, - field_bidirect_16x8_kernel, - sizeof(field_bidirect_16x8_kernel), - NULL + .name = "FIELD_BIDIRECT_16X8", + .interface = FIELD_BIDIRECT_16X8, + .bin = field_bidirect_16x8_kernel, + .size = sizeof(field_bidirect_16x8_kernel), + .bo = NULL } }; @@ -330,123 +330,123 @@ static const uint32_t field_bidirect_16x8_kernel_gen5[][4] = { static struct i965_kernel mpeg2_vld_kernels_gen5[] = { { - "FRAME_INTRA", - FRAME_INTRA, - frame_intra_kernel_gen5, - sizeof(frame_intra_kernel_gen5), - NULL + .name = "FRAME_INTRA", + .interface = FRAME_INTRA, + .bin = frame_intra_kernel_gen5, + .size = sizeof(frame_intra_kernel_gen5), + .bo = NULL }, { - "FRAME_FRAME_PRED_FORWARD", - FRAME_FRAME_PRED_FORWARD, - frame_frame_pred_forward_kernel_gen5, - sizeof(frame_frame_pred_forward_kernel_gen5), - NULL + .name = "FRAME_FRAME_PRED_FORWARD", + .interface = FRAME_FRAME_PRED_FORWARD, + .bin = frame_frame_pred_forward_kernel_gen5, + .size = sizeof(frame_frame_pred_forward_kernel_gen5), + .bo = NULL }, { - "FRAME_FRAME_PRED_BACKWARD", - FRAME_FRAME_PRED_BACKWARD, - frame_frame_pred_backward_kernel_gen5, - sizeof(frame_frame_pred_backward_kernel_gen5), - NULL + .name = "FRAME_FRAME_PRED_BACKWARD", + .interface = FRAME_FRAME_PRED_BACKWARD, + .bin = frame_frame_pred_backward_kernel_gen5, + .size = sizeof(frame_frame_pred_backward_kernel_gen5), + .bo = NULL }, { - "FRAME_FRAME_PRED_BIDIRECT", - FRAME_FRAME_PRED_BIDIRECT, - frame_frame_pred_bidirect_kernel_gen5, - sizeof(frame_frame_pred_bidirect_kernel_gen5), - NULL + .name = "FRAME_FRAME_PRED_BIDIRECT", + .interface = FRAME_FRAME_PRED_BIDIRECT, + .bin = frame_frame_pred_bidirect_kernel_gen5, + .size = sizeof(frame_frame_pred_bidirect_kernel_gen5), + .bo = NULL }, { - "FRAME_FIELD_PRED_FORWARD", - FRAME_FIELD_PRED_FORWARD, - frame_field_pred_forward_kernel_gen5, - sizeof(frame_field_pred_forward_kernel_gen5), - NULL + .name = "FRAME_FIELD_PRED_FORWARD", + .interface = FRAME_FIELD_PRED_FORWARD, + .bin = frame_field_pred_forward_kernel_gen5, + .size = sizeof(frame_field_pred_forward_kernel_gen5), + .bo = NULL }, { - "FRAME_FIELD_PRED_BACKWARD", - FRAME_FIELD_PRED_BACKWARD, - frame_field_pred_backward_kernel_gen5, - sizeof(frame_field_pred_backward_kernel_gen5), - NULL + .name = "FRAME_FIELD_PRED_BACKWARD", + .interface = FRAME_FIELD_PRED_BACKWARD, + .bin = frame_field_pred_backward_kernel_gen5, + .size = sizeof(frame_field_pred_backward_kernel_gen5), + .bo = NULL }, { - "FRAME_FIELD_PRED_BIDIRECT", - FRAME_FIELD_PRED_BIDIRECT, - frame_field_pred_bidirect_kernel_gen5, - sizeof(frame_field_pred_bidirect_kernel_gen5), - NULL + .name = "FRAME_FIELD_PRED_BIDIRECT", + .interface = FRAME_FIELD_PRED_BIDIRECT, + .bin = frame_field_pred_bidirect_kernel_gen5, + .size = sizeof(frame_field_pred_bidirect_kernel_gen5), + .bo = NULL }, { - "LIB", - LIB_INTERFACE, - lib_kernel_gen5, - sizeof(lib_kernel_gen5), - NULL + .name = "LIB", + .interface = LIB_INTERFACE, + .bin = lib_kernel_gen5, + .size = sizeof(lib_kernel_gen5), + .bo = NULL }, { - "FIELD_INTRA", - FIELD_INTRA, - field_intra_kernel_gen5, - sizeof(field_intra_kernel_gen5), - NULL + .name = "FIELD_INTRA", + .interface = FIELD_INTRA, + .bin = field_intra_kernel_gen5, + .size = sizeof(field_intra_kernel_gen5), + .bo = NULL }, { - "FIELD_FORWARD", - FIELD_FORWARD, - field_forward_kernel_gen5, - sizeof(field_forward_kernel_gen5), - NULL + .name = "FIELD_FORWARD", + .interface = FIELD_FORWARD, + .bin = field_forward_kernel_gen5, + .size = sizeof(field_forward_kernel_gen5), + .bo = NULL }, { - "FIELD_FORWARD_16X8", - FIELD_FORWARD_16X8, - field_forward_16x8_kernel_gen5, - sizeof(field_forward_16x8_kernel_gen5), - NULL + .name = "FIELD_FORWARD_16X8", + .interface = FIELD_FORWARD_16X8, + .bin = field_forward_16x8_kernel_gen5, + .size = sizeof(field_forward_16x8_kernel_gen5), + .bo = NULL }, { - "FIELD_BACKWARD", - FIELD_BACKWARD, - field_backward_kernel_gen5, - sizeof(field_backward_kernel_gen5), - NULL + .name = "FIELD_BACKWARD", + .interface = FIELD_BACKWARD, + .bin = field_backward_kernel_gen5, + .size = sizeof(field_backward_kernel_gen5), + .bo = NULL }, { - "FIELD_BACKWARD_16X8", - FIELD_BACKWARD_16X8, - field_backward_16x8_kernel_gen5, - sizeof(field_backward_16x8_kernel_gen5), - NULL + .name = "FIELD_BACKWARD_16X8", + .interface = FIELD_BACKWARD_16X8, + .bin = field_backward_16x8_kernel_gen5, + .size = sizeof(field_backward_16x8_kernel_gen5), + .bo = NULL }, { - "FIELD_BIDIRECT", - FIELD_BIDIRECT, - field_bidirect_kernel_gen5, - sizeof(field_bidirect_kernel_gen5), - NULL + .name = "FIELD_BIDIRECT", + .interface = FIELD_BIDIRECT, + .bin = field_bidirect_kernel_gen5, + .size = sizeof(field_bidirect_kernel_gen5), + .bo = NULL }, { - "FIELD_BIDIRECT_16X8", - FIELD_BIDIRECT_16X8, - field_bidirect_16x8_kernel_gen5, - sizeof(field_bidirect_16x8_kernel_gen5), - NULL + .name = "FIELD_BIDIRECT_16X8", + .interface = FIELD_BIDIRECT_16X8, + .bin = field_bidirect_16x8_kernel_gen5, + .size = sizeof(field_bidirect_16x8_kernel_gen5), + .bo = NULL } }; diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c index 34a6c9931..a49246418 100644 --- a/src/i965_post_processing.c +++ b/src/i965_post_processing.c @@ -175,11 +175,11 @@ static VAStatus pp_nv12_dn_initialize(VADriverContextP ctx, struct i965_post_pro static struct pp_module pp_modules_gen5[] = { { { - "NULL module (for testing)", - PP_NULL, - pp_null_gen5, - sizeof(pp_null_gen5), - NULL, + .name = "NULL module (for testing)", + .interface = PP_NULL, + .bin = pp_null_gen5, + .size = sizeof(pp_null_gen5), + .bo = NULL, }, pp_null_initialize, @@ -187,11 +187,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "NV12_NV12", - PP_NV12_LOAD_SAVE_N12, - pp_nv12_load_save_nv12_gen5, - sizeof(pp_nv12_load_save_nv12_gen5), - NULL, + .name = "NV12_NV12", + .interface = PP_NV12_LOAD_SAVE_N12, + .bin = pp_nv12_load_save_nv12_gen5, + .size = sizeof(pp_nv12_load_save_nv12_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -199,11 +199,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "NV12_PL3", - PP_NV12_LOAD_SAVE_PL3, - pp_nv12_load_save_pl3_gen5, - sizeof(pp_nv12_load_save_pl3_gen5), - NULL, + .name = "NV12_PL3", + .interface = PP_NV12_LOAD_SAVE_PL3, + .bin = pp_nv12_load_save_pl3_gen5, + .size = sizeof(pp_nv12_load_save_pl3_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -211,11 +211,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "PL3_NV12", - PP_PL3_LOAD_SAVE_N12, - pp_pl3_load_save_nv12_gen5, - sizeof(pp_pl3_load_save_nv12_gen5), - NULL, + .name = "PL3_NV12", + .interface = PP_PL3_LOAD_SAVE_N12, + .bin = pp_pl3_load_save_nv12_gen5, + .size = sizeof(pp_pl3_load_save_nv12_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -223,11 +223,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "PL3_PL3", - PP_PL3_LOAD_SAVE_PL3, - pp_pl3_load_save_pl3_gen5, - sizeof(pp_pl3_load_save_pl3_gen5), - NULL, + .name = "PL3_PL3", + .interface = PP_PL3_LOAD_SAVE_PL3, + .bin = pp_pl3_load_save_pl3_gen5, + .size = sizeof(pp_pl3_load_save_pl3_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize @@ -235,11 +235,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "NV12 Scaling module", - PP_NV12_SCALING, - pp_nv12_scaling_gen5, - sizeof(pp_nv12_scaling_gen5), - NULL, + .name = "NV12 Scaling module", + .interface = PP_NV12_SCALING, + .bin = pp_nv12_scaling_gen5, + .size = sizeof(pp_nv12_scaling_gen5), + .bo = NULL, }, pp_nv12_scaling_initialize, @@ -247,11 +247,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "NV12 AVS module", - PP_NV12_AVS, - pp_nv12_avs_gen5, - sizeof(pp_nv12_avs_gen5), - NULL, + .name = "NV12 AVS module", + .interface = PP_NV12_AVS, + .bin = pp_nv12_avs_gen5, + .size = sizeof(pp_nv12_avs_gen5), + .bo = NULL, }, pp_nv12_avs_initialize, @@ -259,11 +259,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "NV12 DNDI module", - PP_NV12_DNDI, - pp_nv12_dndi_gen5, - sizeof(pp_nv12_dndi_gen5), - NULL, + .name = "NV12 DNDI module", + .interface = PP_NV12_DNDI, + .bin = pp_nv12_dndi_gen5, + .size = sizeof(pp_nv12_dndi_gen5), + .bo = NULL, }, pp_nv12_dndi_initialize, @@ -271,11 +271,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "NV12 DN module", - PP_NV12_DN, - pp_nv12_dn_gen5, - sizeof(pp_nv12_dn_gen5), - NULL, + .name = "NV12 DN module", + .interface = PP_NV12_DN, + .bin = pp_nv12_dn_gen5, + .size = sizeof(pp_nv12_dn_gen5), + .bo = NULL, }, pp_nv12_dn_initialize, @@ -283,11 +283,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "NV12_PA module", - PP_NV12_LOAD_SAVE_PA, - pp_nv12_load_save_pa_gen5, - sizeof(pp_nv12_load_save_pa_gen5), - NULL, + .name = "NV12_PA module", + .interface = PP_NV12_LOAD_SAVE_PA, + .bin = pp_nv12_load_save_pa_gen5, + .size = sizeof(pp_nv12_load_save_pa_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -295,11 +295,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "PL3_PA module", - PP_PL3_LOAD_SAVE_PA, - pp_pl3_load_save_pa_gen5, - sizeof(pp_pl3_load_save_pa_gen5), - NULL, + .name = "PL3_PA module", + .interface = PP_PL3_LOAD_SAVE_PA, + .bin = pp_pl3_load_save_pa_gen5, + .size = sizeof(pp_pl3_load_save_pa_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -307,11 +307,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "PA_NV12 module", - PP_PA_LOAD_SAVE_NV12, - pp_pa_load_save_nv12_gen5, - sizeof(pp_pa_load_save_nv12_gen5), - NULL, + .name = "PA_NV12 module", + .interface = PP_PA_LOAD_SAVE_NV12, + .bin = pp_pa_load_save_nv12_gen5, + .size = sizeof(pp_pa_load_save_nv12_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -319,11 +319,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "PA_PL3 module", - PP_PA_LOAD_SAVE_PL3, - pp_pa_load_save_pl3_gen5, - sizeof(pp_pa_load_save_pl3_gen5), - NULL, + .name = "PA_PL3 module", + .interface = PP_PA_LOAD_SAVE_PL3, + .bin = pp_pa_load_save_pl3_gen5, + .size = sizeof(pp_pa_load_save_pl3_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -331,11 +331,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "PA_PA module", - PP_PA_LOAD_SAVE_PA, - pp_pa_load_save_pa_gen5, - sizeof(pp_pa_load_save_pa_gen5), - NULL, + .name = "PA_PA module", + .interface = PP_PA_LOAD_SAVE_PA, + .bin = pp_pa_load_save_pa_gen5, + .size = sizeof(pp_pa_load_save_pa_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -343,11 +343,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "RGBX_NV12 module", - PP_RGBX_LOAD_SAVE_NV12, - pp_rgbx_load_save_nv12_gen5, - sizeof(pp_rgbx_load_save_nv12_gen5), - NULL, + .name = "RGBX_NV12 module", + .interface = PP_RGBX_LOAD_SAVE_NV12, + .bin = pp_rgbx_load_save_nv12_gen5, + .size = sizeof(pp_rgbx_load_save_nv12_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -355,11 +355,11 @@ static struct pp_module pp_modules_gen5[] = { { { - "NV12_RGBX module", - PP_NV12_LOAD_SAVE_RGBX, - pp_nv12_load_save_rgbx_gen5, - sizeof(pp_nv12_load_save_rgbx_gen5), - NULL, + .name = "NV12_RGBX module", + .interface = PP_NV12_LOAD_SAVE_RGBX, + .bin = pp_nv12_load_save_rgbx_gen5, + .size = sizeof(pp_nv12_load_save_rgbx_gen5), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -433,11 +433,11 @@ static const uint32_t pp_nv12_load_save_rgbx_gen6[][4] = { static struct pp_module pp_modules_gen6[] = { { { - "NULL module (for testing)", - PP_NULL, - pp_null_gen6, - sizeof(pp_null_gen6), - NULL, + .name = "NULL module (for testing)", + .interface = PP_NULL, + .bin = pp_null_gen6, + .size = sizeof(pp_null_gen6), + .bo = NULL, }, pp_null_initialize, @@ -445,11 +445,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "NV12_NV12", - PP_NV12_LOAD_SAVE_N12, - pp_nv12_load_save_nv12_gen6, - sizeof(pp_nv12_load_save_nv12_gen6), - NULL, + .name = "NV12_NV12", + .interface = PP_NV12_LOAD_SAVE_N12, + .bin = pp_nv12_load_save_nv12_gen6, + .size = sizeof(pp_nv12_load_save_nv12_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -457,11 +457,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "NV12_PL3", - PP_NV12_LOAD_SAVE_PL3, - pp_nv12_load_save_pl3_gen6, - sizeof(pp_nv12_load_save_pl3_gen6), - NULL, + .name = "NV12_PL3", + .interface = PP_NV12_LOAD_SAVE_PL3, + .bin = pp_nv12_load_save_pl3_gen6, + .size = sizeof(pp_nv12_load_save_pl3_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -469,11 +469,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "PL3_NV12", - PP_PL3_LOAD_SAVE_N12, - pp_pl3_load_save_nv12_gen6, - sizeof(pp_pl3_load_save_nv12_gen6), - NULL, + .name = "PL3_NV12", + .interface = PP_PL3_LOAD_SAVE_N12, + .bin = pp_pl3_load_save_nv12_gen6, + .size = sizeof(pp_pl3_load_save_nv12_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -481,11 +481,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "PL3_PL3", - PP_PL3_LOAD_SAVE_PL3, - pp_pl3_load_save_pl3_gen6, - sizeof(pp_pl3_load_save_pl3_gen6), - NULL, + .name = "PL3_PL3", + .interface = PP_PL3_LOAD_SAVE_PL3, + .bin = pp_pl3_load_save_pl3_gen6, + .size = sizeof(pp_pl3_load_save_pl3_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -493,11 +493,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "NV12 Scaling module", - PP_NV12_SCALING, - pp_nv12_scaling_gen6, - sizeof(pp_nv12_scaling_gen6), - NULL, + .name = "NV12 Scaling module", + .interface = PP_NV12_SCALING, + .bin = pp_nv12_scaling_gen6, + .size = sizeof(pp_nv12_scaling_gen6), + .bo = NULL, }, gen6_nv12_scaling_initialize, @@ -505,11 +505,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "NV12 AVS module", - PP_NV12_AVS, - pp_nv12_avs_gen6, - sizeof(pp_nv12_avs_gen6), - NULL, + .name = "NV12 AVS module", + .interface = PP_NV12_AVS, + .bin = pp_nv12_avs_gen6, + .size = sizeof(pp_nv12_avs_gen6), + .bo = NULL, }, pp_nv12_avs_initialize, @@ -517,11 +517,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "NV12 DNDI module", - PP_NV12_DNDI, - pp_nv12_dndi_gen6, - sizeof(pp_nv12_dndi_gen6), - NULL, + .name = "NV12 DNDI module", + .interface = PP_NV12_DNDI, + .bin = pp_nv12_dndi_gen6, + .size = sizeof(pp_nv12_dndi_gen6), + .bo = NULL, }, pp_nv12_dndi_initialize, @@ -529,22 +529,22 @@ static struct pp_module pp_modules_gen6[] = { { { - "NV12 DN module", - PP_NV12_DN, - pp_nv12_dn_gen6, - sizeof(pp_nv12_dn_gen6), - NULL, + .name = "NV12 DN module", + .interface = PP_NV12_DN, + .bin = pp_nv12_dn_gen6, + .size = sizeof(pp_nv12_dn_gen6), + .bo = NULL, }, pp_nv12_dn_initialize, }, { { - "NV12_PA module", - PP_NV12_LOAD_SAVE_PA, - pp_nv12_load_save_pa_gen6, - sizeof(pp_nv12_load_save_pa_gen6), - NULL, + .name = "NV12_PA module", + .interface = PP_NV12_LOAD_SAVE_PA, + .bin = pp_nv12_load_save_pa_gen6, + .size = sizeof(pp_nv12_load_save_pa_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -552,11 +552,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "PL3_PA module", - PP_PL3_LOAD_SAVE_PA, - pp_pl3_load_save_pa_gen6, - sizeof(pp_pl3_load_save_pa_gen6), - NULL, + .name = "PL3_PA module", + .interface = PP_PL3_LOAD_SAVE_PA, + .bin = pp_pl3_load_save_pa_gen6, + .size = sizeof(pp_pl3_load_save_pa_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -564,11 +564,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "PA_NV12 module", - PP_PA_LOAD_SAVE_NV12, - pp_pa_load_save_nv12_gen6, - sizeof(pp_pa_load_save_nv12_gen6), - NULL, + .name = "PA_NV12 module", + .interface = PP_PA_LOAD_SAVE_NV12, + .bin = pp_pa_load_save_nv12_gen6, + .size = sizeof(pp_pa_load_save_nv12_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -576,11 +576,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "PA_PL3 module", - PP_PA_LOAD_SAVE_PL3, - pp_pa_load_save_pl3_gen6, - sizeof(pp_pa_load_save_pl3_gen6), - NULL, + .name = "PA_PL3 module", + .interface = PP_PA_LOAD_SAVE_PL3, + .bin = pp_pa_load_save_pl3_gen6, + .size = sizeof(pp_pa_load_save_pl3_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -588,11 +588,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "PA_PA module", - PP_PA_LOAD_SAVE_PA, - pp_pa_load_save_pa_gen6, - sizeof(pp_pa_load_save_pa_gen6), - NULL, + .name = "PA_PA module", + .interface = PP_PA_LOAD_SAVE_PA, + .bin = pp_pa_load_save_pa_gen6, + .size = sizeof(pp_pa_load_save_pa_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -600,11 +600,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "RGBX_NV12 module", - PP_RGBX_LOAD_SAVE_NV12, - pp_rgbx_load_save_nv12_gen6, - sizeof(pp_rgbx_load_save_nv12_gen6), - NULL, + .name = "RGBX_NV12 module", + .interface = PP_RGBX_LOAD_SAVE_NV12, + .bin = pp_rgbx_load_save_nv12_gen6, + .size = sizeof(pp_rgbx_load_save_nv12_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -612,11 +612,11 @@ static struct pp_module pp_modules_gen6[] = { { { - "NV12_RGBX module", - PP_NV12_LOAD_SAVE_RGBX, - pp_nv12_load_save_rgbx_gen6, - sizeof(pp_nv12_load_save_rgbx_gen6), - NULL, + .name = "NV12_RGBX module", + .interface = PP_NV12_LOAD_SAVE_RGBX, + .bin = pp_nv12_load_save_rgbx_gen6, + .size = sizeof(pp_nv12_load_save_rgbx_gen6), + .bo = NULL, }, pp_plx_load_save_plx_initialize, @@ -701,11 +701,11 @@ static VAStatus gen7_pp_nv12_dn_initialize(VADriverContextP ctx, struct i965_pos static struct pp_module pp_modules_gen7[] = { { { - "NULL module (for testing)", - PP_NULL, - pp_null_gen7, - sizeof(pp_null_gen7), - NULL, + .name = "NULL module (for testing)", + .interface = PP_NULL, + .bin = pp_null_gen7, + .size = sizeof(pp_null_gen7), + .bo = NULL, }, pp_null_initialize, @@ -713,11 +713,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "NV12_NV12", - PP_NV12_LOAD_SAVE_N12, - pp_nv12_load_save_nv12_gen7, - sizeof(pp_nv12_load_save_nv12_gen7), - NULL, + .name = "NV12_NV12", + .interface = PP_NV12_LOAD_SAVE_N12, + .bin = pp_nv12_load_save_nv12_gen7, + .size = sizeof(pp_nv12_load_save_nv12_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -725,11 +725,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "NV12_PL3", - PP_NV12_LOAD_SAVE_PL3, - pp_nv12_load_save_pl3_gen7, - sizeof(pp_nv12_load_save_pl3_gen7), - NULL, + .name = "NV12_PL3", + .interface = PP_NV12_LOAD_SAVE_PL3, + .bin = pp_nv12_load_save_pl3_gen7, + .size = sizeof(pp_nv12_load_save_pl3_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -737,11 +737,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "PL3_NV12", - PP_PL3_LOAD_SAVE_N12, - pp_pl3_load_save_nv12_gen7, - sizeof(pp_pl3_load_save_nv12_gen7), - NULL, + .name = "PL3_NV12", + .interface = PP_PL3_LOAD_SAVE_N12, + .bin = pp_pl3_load_save_nv12_gen7, + .size = sizeof(pp_pl3_load_save_nv12_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -749,11 +749,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "PL3_PL3", - PP_PL3_LOAD_SAVE_PL3, - pp_pl3_load_save_pl3_gen7, - sizeof(pp_pl3_load_save_pl3_gen7), - NULL, + .name = "PL3_PL3", + .interface = PP_PL3_LOAD_SAVE_PL3, + .bin = pp_pl3_load_save_pl3_gen7, + .size = sizeof(pp_pl3_load_save_pl3_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -761,11 +761,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "NV12 Scaling module", - PP_NV12_SCALING, - pp_nv12_scaling_gen7, - sizeof(pp_nv12_scaling_gen7), - NULL, + .name = "NV12 Scaling module", + .interface = PP_NV12_SCALING, + .bin = pp_nv12_scaling_gen7, + .size = sizeof(pp_nv12_scaling_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -773,11 +773,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "NV12 AVS module", - PP_NV12_AVS, - pp_nv12_avs_gen7, - sizeof(pp_nv12_avs_gen7), - NULL, + .name = "NV12 AVS module", + .interface = PP_NV12_AVS, + .bin = pp_nv12_avs_gen7, + .size = sizeof(pp_nv12_avs_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -785,11 +785,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "NV12 DNDI module", - PP_NV12_DNDI, - pp_nv12_dndi_gen7, - sizeof(pp_nv12_dndi_gen7), - NULL, + .name = "NV12 DNDI module", + .interface = PP_NV12_DNDI, + .bin = pp_nv12_dndi_gen7, + .size = sizeof(pp_nv12_dndi_gen7), + .bo = NULL, }, gen7_pp_nv12_dndi_initialize, @@ -797,22 +797,22 @@ static struct pp_module pp_modules_gen7[] = { { { - "NV12 DN module", - PP_NV12_DN, - pp_nv12_dn_gen7, - sizeof(pp_nv12_dn_gen7), - NULL, + .name = "NV12 DN module", + .interface = PP_NV12_DN, + .bin = pp_nv12_dn_gen7, + .size = sizeof(pp_nv12_dn_gen7), + .bo = NULL, }, gen7_pp_nv12_dn_initialize, }, { { - "NV12_PA module", - PP_NV12_LOAD_SAVE_PA, - pp_nv12_load_save_pa_gen7, - sizeof(pp_nv12_load_save_pa_gen7), - NULL, + .name = "NV12_PA module", + .interface = PP_NV12_LOAD_SAVE_PA, + .bin = pp_nv12_load_save_pa_gen7, + .size = sizeof(pp_nv12_load_save_pa_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -820,11 +820,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "PL3_PA module", - PP_PL3_LOAD_SAVE_PA, - pp_pl3_load_save_pa_gen7, - sizeof(pp_pl3_load_save_pa_gen7), - NULL, + .name = "PL3_PA module", + .interface = PP_PL3_LOAD_SAVE_PA, + .bin = pp_pl3_load_save_pa_gen7, + .size = sizeof(pp_pl3_load_save_pa_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -832,11 +832,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "PA_NV12 module", - PP_PA_LOAD_SAVE_NV12, - pp_pa_load_save_nv12_gen7, - sizeof(pp_pa_load_save_nv12_gen7), - NULL, + .name = "PA_NV12 module", + .interface = PP_PA_LOAD_SAVE_NV12, + .bin = pp_pa_load_save_nv12_gen7, + .size = sizeof(pp_pa_load_save_nv12_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -844,11 +844,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "PA_PL3 module", - PP_PA_LOAD_SAVE_PL3, - pp_pa_load_save_pl3_gen7, - sizeof(pp_pa_load_save_pl3_gen7), - NULL, + .name = "PA_PL3 module", + .interface = PP_PA_LOAD_SAVE_PL3, + .bin = pp_pa_load_save_pl3_gen7, + .size = sizeof(pp_pa_load_save_pl3_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -856,11 +856,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "PA_PA module", - PP_PA_LOAD_SAVE_PA, - pp_pa_load_save_pa_gen7, - sizeof(pp_pa_load_save_pa_gen7), - NULL, + .name = "PA_PA module", + .interface = PP_PA_LOAD_SAVE_PA, + .bin = pp_pa_load_save_pa_gen7, + .size = sizeof(pp_pa_load_save_pa_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -868,11 +868,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "RGBX_NV12 module", - PP_RGBX_LOAD_SAVE_NV12, - pp_rgbx_load_save_nv12_gen7, - sizeof(pp_rgbx_load_save_nv12_gen7), - NULL, + .name = "RGBX_NV12 module", + .interface = PP_RGBX_LOAD_SAVE_NV12, + .bin = pp_rgbx_load_save_nv12_gen7, + .size = sizeof(pp_rgbx_load_save_nv12_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -880,11 +880,11 @@ static struct pp_module pp_modules_gen7[] = { { { - "NV12_RGBX module", - PP_NV12_LOAD_SAVE_RGBX, - pp_nv12_load_save_rgbx_gen7, - sizeof(pp_nv12_load_save_rgbx_gen7), - NULL, + .name = "NV12_RGBX module", + .interface = PP_NV12_LOAD_SAVE_RGBX, + .bin = pp_nv12_load_save_rgbx_gen7, + .size = sizeof(pp_nv12_load_save_rgbx_gen7), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -951,11 +951,11 @@ static const uint32_t pp_nv12_load_save_rgbx_gen75[][4] = { static struct pp_module pp_modules_gen75[] = { { { - "NULL module (for testing)", - PP_NULL, - pp_null_gen75, - sizeof(pp_null_gen75), - NULL, + .name = "NULL module (for testing)", + .interface = PP_NULL, + .bin = pp_null_gen75, + .size = sizeof(pp_null_gen75), + .bo = NULL, }, pp_null_initialize, @@ -963,11 +963,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "NV12_NV12", - PP_NV12_LOAD_SAVE_N12, - pp_nv12_load_save_nv12_gen75, - sizeof(pp_nv12_load_save_nv12_gen75), - NULL, + .name = "NV12_NV12", + .interface = PP_NV12_LOAD_SAVE_N12, + .bin = pp_nv12_load_save_nv12_gen75, + .size = sizeof(pp_nv12_load_save_nv12_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -975,11 +975,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "NV12_PL3", - PP_NV12_LOAD_SAVE_PL3, - pp_nv12_load_save_pl3_gen75, - sizeof(pp_nv12_load_save_pl3_gen75), - NULL, + .name = "NV12_PL3", + .interface = PP_NV12_LOAD_SAVE_PL3, + .bin = pp_nv12_load_save_pl3_gen75, + .size = sizeof(pp_nv12_load_save_pl3_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -987,11 +987,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "PL3_NV12", - PP_PL3_LOAD_SAVE_N12, - pp_pl3_load_save_nv12_gen75, - sizeof(pp_pl3_load_save_nv12_gen75), - NULL, + .name = "PL3_NV12", + .interface = PP_PL3_LOAD_SAVE_N12, + .bin = pp_pl3_load_save_nv12_gen75, + .size = sizeof(pp_pl3_load_save_nv12_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -999,11 +999,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "PL3_PL3", - PP_PL3_LOAD_SAVE_PL3, - pp_pl3_load_save_pl3_gen75, - sizeof(pp_pl3_load_save_pl3_gen75), - NULL, + .name = "PL3_PL3", + .interface = PP_PL3_LOAD_SAVE_PL3, + .bin = pp_pl3_load_save_pl3_gen75, + .size = sizeof(pp_pl3_load_save_pl3_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1011,11 +1011,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "NV12 Scaling module", - PP_NV12_SCALING, - pp_nv12_scaling_gen75, - sizeof(pp_nv12_scaling_gen75), - NULL, + .name = "NV12 Scaling module", + .interface = PP_NV12_SCALING, + .bin = pp_nv12_scaling_gen75, + .size = sizeof(pp_nv12_scaling_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1023,11 +1023,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "NV12 AVS module", - PP_NV12_AVS, - pp_nv12_avs_gen75, - sizeof(pp_nv12_avs_gen75), - NULL, + .name = "NV12 AVS module", + .interface = PP_NV12_AVS, + .bin = pp_nv12_avs_gen75, + .size = sizeof(pp_nv12_avs_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1035,11 +1035,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "NV12 DNDI module", - PP_NV12_DNDI, - pp_nv12_dndi_gen75, - sizeof(pp_nv12_dndi_gen75), - NULL, + .name = "NV12 DNDI module", + .interface = PP_NV12_DNDI, + .bin = pp_nv12_dndi_gen75, + .size = sizeof(pp_nv12_dndi_gen75), + .bo = NULL, }, gen7_pp_nv12_dn_initialize, @@ -1047,11 +1047,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "NV12 DN module", - PP_NV12_DN, - pp_nv12_dn_gen75, - sizeof(pp_nv12_dn_gen75), - NULL, + .name = "NV12 DN module", + .interface = PP_NV12_DN, + .bin = pp_nv12_dn_gen75, + .size = sizeof(pp_nv12_dn_gen75), + .bo = NULL, }, gen7_pp_nv12_dn_initialize, @@ -1059,11 +1059,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "NV12_PA module", - PP_NV12_LOAD_SAVE_PA, - pp_nv12_load_save_pa_gen75, - sizeof(pp_nv12_load_save_pa_gen75), - NULL, + .name = "NV12_PA module", + .interface = PP_NV12_LOAD_SAVE_PA, + .bin = pp_nv12_load_save_pa_gen75, + .size = sizeof(pp_nv12_load_save_pa_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1071,11 +1071,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "PL3_PA module", - PP_PL3_LOAD_SAVE_PA, - pp_pl3_load_save_pa_gen75, - sizeof(pp_pl3_load_save_pa_gen75), - NULL, + .name = "PL3_PA module", + .interface = PP_PL3_LOAD_SAVE_PA, + .bin = pp_pl3_load_save_pa_gen75, + .size = sizeof(pp_pl3_load_save_pa_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1083,11 +1083,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "PA_NV12 module", - PP_PA_LOAD_SAVE_NV12, - pp_pa_load_save_nv12_gen75, - sizeof(pp_pa_load_save_nv12_gen75), - NULL, + .name = "PA_NV12 module", + .interface = PP_PA_LOAD_SAVE_NV12, + .bin = pp_pa_load_save_nv12_gen75, + .size = sizeof(pp_pa_load_save_nv12_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1095,11 +1095,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "PA_PL3 module", - PP_PA_LOAD_SAVE_PL3, - pp_pa_load_save_pl3_gen75, - sizeof(pp_pa_load_save_pl3_gen75), - NULL, + .name = "PA_PL3 module", + .interface = PP_PA_LOAD_SAVE_PL3, + .bin = pp_pa_load_save_pl3_gen75, + .size = sizeof(pp_pa_load_save_pl3_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1107,11 +1107,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "PA_PA module", - PP_PA_LOAD_SAVE_PA, - pp_pa_load_save_pa_gen75, - sizeof(pp_pa_load_save_pa_gen75), - NULL, + .name = "PA_PA module", + .interface = PP_PA_LOAD_SAVE_PA, + .bin = pp_pa_load_save_pa_gen75, + .size = sizeof(pp_pa_load_save_pa_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1119,11 +1119,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "RGBX_NV12 module", - PP_RGBX_LOAD_SAVE_NV12, - pp_rgbx_load_save_nv12_gen75, - sizeof(pp_rgbx_load_save_nv12_gen75), - NULL, + .name = "RGBX_NV12 module", + .interface = PP_RGBX_LOAD_SAVE_NV12, + .bin = pp_rgbx_load_save_nv12_gen75, + .size = sizeof(pp_rgbx_load_save_nv12_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, @@ -1131,11 +1131,11 @@ static struct pp_module pp_modules_gen75[] = { { { - "NV12_RGBX module", - PP_NV12_LOAD_SAVE_RGBX, - pp_nv12_load_save_rgbx_gen75, - sizeof(pp_nv12_load_save_rgbx_gen75), - NULL, + .name = "NV12_RGBX module", + .interface = PP_NV12_LOAD_SAVE_RGBX, + .bin = pp_nv12_load_save_rgbx_gen75, + .size = sizeof(pp_nv12_load_save_rgbx_gen75), + .bo = NULL, }, gen7_pp_plx_avs_initialize, diff --git a/src/i965_post_processing.h b/src/i965_post_processing.h index 84e77da82..929269bf1 100644 --- a/src/i965_post_processing.h +++ b/src/i965_post_processing.h @@ -471,8 +471,17 @@ struct gen7_pp_inline_parameter { } grf10; }; -struct i965_post_processing_context { +struct i965_post_processing_context +{ int current_pp; + +#define VPPGPE_8BIT_8BIT (1 << 0) +#define VPPGPE_8BIT_10BIT (1 << 1) +#define VPPGPE_10BIT_10BIT (1 << 2) +#define VPPGPE_10BIT_8BIT (1 << 3) +#define VPPGPE_8BIT_420_RGB32 (1 << 4) + unsigned int scaling_gpe_context_initialized; + struct pp_module pp_modules[NUM_PP_MODULES]; void *pp_static_parameter; void *pp_inline_parameter; @@ -587,14 +596,6 @@ struct i965_post_processing_context { struct i965_gpe_context scaling_gpe_context; - -#define VPPGPE_8BIT_8BIT (1 << 0) -#define VPPGPE_8BIT_10BIT (1 << 1) -#define VPPGPE_10BIT_10BIT (1 << 2) -#define VPPGPE_10BIT_8BIT (1 << 3) -#define VPPGPE_8BIT_420_RGB32 (1 << 4) - - unsigned int scaling_gpe_context_initialized; }; struct i965_proc_context { diff --git a/src/i965_render.c b/src/i965_render.c index b46cc4ea3..b0a90c963 100644 --- a/src/i965_render.c +++ b/src/i965_render.c @@ -167,171 +167,171 @@ enum { static struct i965_kernel render_kernels_gen4[] = { { - "SF", - SF_KERNEL, - sf_kernel_static, - sizeof(sf_kernel_static), - NULL + .name = "SF", + .interface = SF_KERNEL, + .bin = sf_kernel_static, + .size = sizeof(sf_kernel_static), + .bo = NULL }, { - "PS", - PS_KERNEL, - ps_kernel_static, - sizeof(ps_kernel_static), - NULL + .name = "PS", + .interface = PS_KERNEL, + .bin = ps_kernel_static, + .size = sizeof(ps_kernel_static), + .bo = NULL }, { - "PS_SUBPIC", - PS_SUBPIC_KERNEL, - ps_subpic_kernel_static, - sizeof(ps_subpic_kernel_static), - NULL + .name = "PS_SUBPIC", + .interface = PS_SUBPIC_KERNEL, + .bin = ps_subpic_kernel_static, + .size = sizeof(ps_subpic_kernel_static), + .bo = NULL }, // Not used { - "PS_CLEAR", - PS_CLEAR_KERNEL, - NULL, - 0, - 0 + .name = "PS_CLEAR", + .interface = PS_CLEAR_KERNEL, + .bin = NULL, + .size = 0, + .bo = NULL } }; static struct i965_kernel render_kernels_gen5[] = { { - "SF", - SF_KERNEL, - sf_kernel_static_gen5, - sizeof(sf_kernel_static_gen5), - NULL + .name = "SF", + .interface = SF_KERNEL, + .bin = sf_kernel_static_gen5, + .size = sizeof(sf_kernel_static_gen5), + .bo = NULL }, { - "PS", - PS_KERNEL, - ps_kernel_static_gen5, - sizeof(ps_kernel_static_gen5), - NULL + .name = "PS", + .interface = PS_KERNEL, + .bin = ps_kernel_static_gen5, + .size = sizeof(ps_kernel_static_gen5), + .bo = NULL }, { - "PS_SUBPIC", - PS_SUBPIC_KERNEL, - ps_subpic_kernel_static_gen5, - sizeof(ps_subpic_kernel_static_gen5), - NULL + .name = "PS_SUBPIC", + .interface = PS_SUBPIC_KERNEL, + .bin = ps_subpic_kernel_static_gen5, + .size = sizeof(ps_subpic_kernel_static_gen5), + .bo = NULL }, // Not used { - "PS_CLEAR", - PS_CLEAR_KERNEL, - NULL, - 0, - 0 + .name = "PS_CLEAR", + .interface = PS_CLEAR_KERNEL, + .bin = NULL, + .size = 0, + .bo = NULL } }; static struct i965_kernel render_kernels_gen6[] = { { - "SF", - SF_KERNEL, - sf_kernel_static_gen6, - sizeof(sf_kernel_static_gen6), - NULL + .name = "SF", + .interface = SF_KERNEL, + .bin = sf_kernel_static_gen6, + .size = sizeof(sf_kernel_static_gen6), + .bo = NULL }, { - "PS", - PS_KERNEL, - ps_kernel_static_gen6, - sizeof(ps_kernel_static_gen6), - NULL + .name = "PS", + .interface = PS_KERNEL, + .bin = ps_kernel_static_gen6, + .size = sizeof(ps_kernel_static_gen6), + .bo = NULL }, { - "PS_SUBPIC", - PS_SUBPIC_KERNEL, - ps_subpic_kernel_static_gen6, - sizeof(ps_subpic_kernel_static_gen6), - NULL + .name = "PS_SUBPIC", + .interface = PS_SUBPIC_KERNEL, + .bin = ps_subpic_kernel_static_gen6, + .size = sizeof(ps_subpic_kernel_static_gen6), + .bo = NULL }, // Not used { - "PS_CLEAR", - PS_CLEAR_KERNEL, - NULL, - 0, - 0 + .name = "PS_CLEAR", + .interface = PS_CLEAR_KERNEL, + .bin = NULL, + .size = 0, + .bo = NULL } }; static struct i965_kernel render_kernels_gen7[] = { { - "SF", - SF_KERNEL, - sf_kernel_static_gen7, - sizeof(sf_kernel_static_gen7), - NULL + .name = "SF", + .interface = SF_KERNEL, + .bin = sf_kernel_static_gen7, + .size = sizeof(sf_kernel_static_gen7), + .bo = NULL }, { - "PS", - PS_KERNEL, - ps_kernel_static_gen7, - sizeof(ps_kernel_static_gen7), - NULL + .name = "PS", + .interface = PS_KERNEL, + .bin = ps_kernel_static_gen7, + .size = sizeof(ps_kernel_static_gen7), + .bo = NULL }, { - "PS_SUBPIC", - PS_SUBPIC_KERNEL, - ps_subpic_kernel_static_gen7, - sizeof(ps_subpic_kernel_static_gen7), - NULL + .name = "PS_SUBPIC", + .interface = PS_SUBPIC_KERNEL, + .bin = ps_subpic_kernel_static_gen7, + .size = sizeof(ps_subpic_kernel_static_gen7), + .bo = NULL }, // Not used { - "PS_CLEAR", - PS_CLEAR_KERNEL, - NULL, - 0, - 0 + .name = "PS_CLEAR", + .interface = PS_CLEAR_KERNEL, + .bin = NULL, + .size = 0, + .bo = NULL } }; static struct i965_kernel render_kernels_gen7_haswell[] = { { - "SF", - SF_KERNEL, - sf_kernel_static_gen7, - sizeof(sf_kernel_static_gen7), - NULL + .name = "SF", + .interface = SF_KERNEL, + .bin = sf_kernel_static_gen7, + .size = sizeof(sf_kernel_static_gen7), + .bo = NULL }, { - "PS", - PS_KERNEL, - ps_kernel_static_gen7_haswell, - sizeof(ps_kernel_static_gen7_haswell), - NULL + .name = "PS", + .interface = PS_KERNEL, + .bin = ps_kernel_static_gen7_haswell, + .size = sizeof(ps_kernel_static_gen7_haswell), + .bo = NULL }, { - "PS_SUBPIC", - PS_SUBPIC_KERNEL, - ps_subpic_kernel_static_gen7, - sizeof(ps_subpic_kernel_static_gen7), - NULL + .name = "PS_SUBPIC", + .interface = PS_SUBPIC_KERNEL, + .bin = ps_subpic_kernel_static_gen7, + .size = sizeof(ps_subpic_kernel_static_gen7), + .bo = NULL }, // Not used { - "PS_CLEAR", - PS_CLEAR_KERNEL, - NULL, - 0, - 0 + .name = "PS_CLEAR", + .interface = PS_CLEAR_KERNEL, + .bin = NULL, + .size = 0, + .bo = NULL } }; diff --git a/src/intel_batchbuffer.h b/src/intel_batchbuffer.h index 644eddf9f..1bf5add20 100644 --- a/src/intel_batchbuffer.h +++ b/src/intel_batchbuffer.h @@ -8,12 +8,13 @@ #include "intel_driver.h" -struct intel_batchbuffer { +struct intel_batchbuffer +{ struct intel_driver_data *intel; dri_bo *buffer; - unsigned int size; unsigned char *map; unsigned char *ptr; + unsigned int size; int atomic; int flag; diff --git a/src/intel_driver.h b/src/intel_driver.h index 54983f1f3..fff5c7be3 100644 --- a/src/intel_driver.h +++ b/src/intel_driver.h @@ -153,53 +153,53 @@ extern uint32_t g_intel_debug_option_flags; } \ } while (0) -struct intel_device_info { +struct intel_device_info +{ int gen; int gt; unsigned int urb_size; unsigned int max_wm_threads; - unsigned int is_g4x : 1; /* gen4 */ - unsigned int is_ivybridge : 1; /* gen7 */ - unsigned int is_baytrail : 1; /* gen7 */ - unsigned int is_haswell : 1; /* gen7 */ - unsigned int is_cherryview : 1; /* gen8 */ - unsigned int is_skylake : 1; /* gen9 */ - unsigned int is_broxton : 1; /* gen9 */ - unsigned int is_kabylake : 1; /* gen9p5 */ - unsigned int is_glklake : 1; /* gen9p5 lp*/ - unsigned int is_cfllake : 1; + bool is_g4x : 1; /* gen4 */ + bool is_ivybridge : 1; /* gen7 */ + bool is_baytrail : 1; /* gen7 */ + bool is_haswell : 1; /* gen7 */ + bool is_cherryview : 1; /* gen8 */ + bool is_skylake : 1; /* gen9 */ + bool is_broxton : 1; /* gen9 */ + bool is_kabylake : 1; /* gen9p5 */ + bool is_glklake : 1; /* gen9p5 lp*/ + bool is_cfllake : 1; }; -struct intel_driver_data { +struct intel_driver_data +{ int fd; int device_id; int revision; - int dri2Enabled; + /* We will always have a positive number of EUs. */ + unsigned int eu_total; sigset_t sa_mask; pthread_mutex_t ctxmutex; int locked; + unsigned int mocs_state; dri_bufmgr *bufmgr; const struct intel_device_info *device_info; - /* We will always have a positive number of EUs. */ - unsigned int eu_total; - - unsigned int mocs_state; - - unsigned int has_exec2 : 1; /* Flag: has execbuffer2? */ - unsigned int has_bsd : 1; /* Flag: has bitstream decoder for H.264? */ - unsigned int has_blt : 1; /* Flag: has BLT unit? */ - unsigned int has_vebox : 1; /* Flag: has VEBOX unit */ - unsigned int has_bsd2 : 1; /* Flag: has the second BSD video ring unit */ - unsigned int has_huc : 1; /* Flag: has a fully loaded HuC firmware? */ - unsigned int hybrid_vp8 : 1; /* Flag: User has enrolled in experimental VP8 encoding support. */ - unsigned int rc_hw_mode : 1; /* Flag: User has enrolled in RateControlCounter */ - unsigned int dec_base : 1; /* Flag: User has enrolled in experimental VA_DEC_SLICE_MODE_BASE support */ + bool dri2Enabled : 1; + bool has_exec2 : 1; /* Flag: has execbuffer2? */ + bool has_bsd : 1; /* Flag: has bitstream decoder for H.264? */ + bool has_blt : 1; /* Flag: has BLT unit? */ + bool has_vebox : 1; /* Flag: has VEBOX unit */ + bool has_bsd2 : 1; /* Flag: has the second BSD video ring unit */ + bool has_huc : 1; /* Flag: has a fully loaded HuC firmware? */ + bool hybrid_vp8 : 1; /* Flag: User has enrolled in experimental VP8 encoding support. */ + bool rc_hw_mode : 1; /* Flag: User has enrolled in RateControlCounter */ + bool dec_base : 1; /* Flag: User has enrolled in experimental VA_DEC_SLICE_MODE_BASE support */ }; bool intel_driver_init(VADriverContextP ctx); diff --git a/src/intel_media.h b/src/intel_media.h index b32a4c2f0..db00010e3 100644 --- a/src/intel_media.h +++ b/src/intel_media.h @@ -38,11 +38,12 @@ struct gen_codec_surface { }; typedef struct gen_avc_surface GenAvcSurface; -struct gen_avc_surface { +struct gen_avc_surface +{ GenCodecSurface base; + int dmv_bottom_flag; dri_bo *dmv_top; dri_bo *dmv_bottom; - int dmv_bottom_flag; }; extern void gen_free_avc_surface(void **data); @@ -51,14 +52,18 @@ extern void gen_free_avc_surface(void **data); extern int intel_format_convert(float src, int out_int_bits, int out_frac_bits, int out_sign_flag); typedef struct gen_hevc_surface GenHevcSurface; -struct gen_hevc_surface { +struct gen_hevc_surface +{ GenCodecSurface base; + VASurfaceID nv12_surface_id; + dri_bo *motion_vector_temporal_bo; + //Encoding HEVC10:internal surface keep for P010->NV12 , this is only for hevc10 to save the P010->NV12 struct object_surface *nv12_surface_obj; - VASurfaceID nv12_surface_id; + VADriverContextP ctx; - int has_p010_to_nv12_done; + bool has_p010_to_nv12_done; }; typedef struct gen_vp9_surface GenVP9Surface; @@ -70,10 +75,11 @@ struct gen_vp9_surface { }; typedef struct vdenc_avc_surface VDEncAvcSurface; -struct vdenc_avc_surface { +struct vdenc_avc_surface +{ VADriverContextP ctx; - VASurfaceID scaled_4x_surface_id; struct object_surface *scaled_4x_surface_obj; + VASurfaceID scaled_4x_surface_id; }; typedef struct vdenc_vp9_surface VDEncVP9Surface; diff --git a/src/object_heap.h b/src/object_heap.h index 3a0361da7..10f350f4f 100644 --- a/src/object_heap.h +++ b/src/object_heap.h @@ -38,15 +38,16 @@ struct object_base { int next_free; }; -struct object_heap { +struct object_heap +{ + void **bucket; + int num_buckets; int object_size; int id_offset; int next_free; int heap_size; int heap_increment; _I965Mutex mutex; - void **bucket; - int num_buckets; }; typedef int object_heap_iterator;