Skip to content

i965/drv: Optimize structs within the codebase. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

i965/drv: Optimize structs within the codebase. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f1ac23
i965/drv: Optimize structs within the codebase.
irql-notlessorequal Mar 2, 2025
1ec3c23
Merge branch 'master' into structification
irql-notlessorequal Mar 12, 2025
6d3a68f
Minor nits from inspection.
irql-notlessorequal Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ TAGS
.VERSION*
# IRQL fork
.vscode/c_cpp_properties.json
.vscode/settings.json
1 change: 1 addition & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
20 changes: 10 additions & 10 deletions src/gen10_vdenc_vp9.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
};

Expand All @@ -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
},
};

Expand Down
20 changes: 10 additions & 10 deletions src/gen6_mfc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
};

Expand Down
30 changes: 15 additions & 15 deletions src/gen6_vme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
};

Expand Down
10 changes: 5 additions & 5 deletions src/gen75_mfc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
};

Expand Down
70 changes: 35 additions & 35 deletions src/gen75_vme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
};

Expand All @@ -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
},
};

Expand Down
60 changes: 30 additions & 30 deletions src/gen75_vpp_gpe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
};

Expand All @@ -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
},
};

Expand Down
20 changes: 10 additions & 10 deletions src/gen7_mfc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
};

Expand Down
10 changes: 6 additions & 4 deletions src/gen7_mfd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ struct gen7_vc1_surface {

struct hw_context;

struct gen7_mfd_context {
struct gen7_mfd_context
{
struct hw_context base;

union {
Expand All @@ -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)
Expand Down
Loading