XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-03-24 01:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace XF86AttributeRec by XvAttributeRec

Browse Source 
XF86AttributeRec has been renamed to XvAttributeRec over a decade
ago, and XF86AttributeRec now just an alias to XvAttributeRec.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-31 15:54:00 +01:00
parent dd35e10a7f
commit 7a01d44b26
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/legacy/i810/i810_video.c
View File

@@ -200,7 +200,7 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] =
#define NUM_ATTRIBUTES 3
static XF86AttributeRec Attributes[NUM_ATTRIBUTES] =
static XvAttributeRec Attributes[NUM_ATTRIBUTES] =
{
{XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
{XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},

4
src/uxa/intel_video.c
View File

@@ -96,7 +96,7 @@ XF86VideoFormatRec intel_xv_formats[NUM_FORMATS] = {
{15, TrueColor}, {16, TrueColor}, {24, TrueColor}
};
XF86AttributeRec intel_xv_attributes[NUM_ATTRIBUTES] = {
XvAttributeRec intel_xv_attributes[NUM_ATTRIBUTES] = {
{XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
{XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
{XvSettable | XvGettable, 0, 255, "XV_CONTRAST"},
@@ -105,7 +105,7 @@ XF86AttributeRec intel_xv_attributes[NUM_ATTRIBUTES] = {
};
#define GAMMA_ATTRIBUTES 6
XF86AttributeRec intel_xv_gamma_attributes[GAMMA_ATTRIBUTES] = {
XvAttributeRec intel_xv_gamma_attributes[GAMMA_ATTRIBUTES] = {
{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA0"},
{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA1"},
{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA2"},

4
src/uxa/intel_video.h
View File

@@ -144,11 +144,11 @@ extern XF86VideoFormatRec intel_xv_formats[NUM_FORMATS];
#define NUM_ATTRIBUTES 5
extern XF86AttributeRec intel_xv_attributes[NUM_ATTRIBUTES];
extern XvAttributeRec intel_xv_attributes[NUM_ATTRIBUTES];
#define GAMMA_ATTRIBUTES 6
extern XF86AttributeRec intel_xv_gamma_attributes[GAMMA_ATTRIBUTES];
extern XvAttributeRec intel_xv_gamma_attributes[GAMMA_ATTRIBUTES];
#ifdef INTEL_XVMC
#define NUM_IMAGES 5

8
src/uxa/intel_video_overlay.c
View File

@@ -433,7 +433,7 @@ XF86VideoAdaptorPtr intel_video_overlay_setup_image(ScreenPtr screen)
intel_screen_private *intel = intel_get_screen_private(scrn);
XF86VideoAdaptorPtr adapt;
intel_adaptor_private *adaptor_priv;
XF86AttributePtr att;
XvAttributePtr att;
/* Set up overlay video if it is available */
intel->use_overlay = intel_has_overlay(intel);
@@ -470,15 +470,15 @@ XF86VideoAdaptorPtr intel_video_overlay_setup_image(ScreenPtr screen)
if (INTEL_INFO(intel)->gen >= 030)
adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */
adapt->pAttributes =
XNFalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
XNFalloc(sizeof(XvAttributeRec) * adapt->nAttributes);
/* Now copy the attributes */
att = adapt->pAttributes;
memcpy((char *)att, (char *)intel_xv_attributes,
sizeof(XF86AttributeRec) * NUM_ATTRIBUTES);
sizeof(XvAttributeRec) * NUM_ATTRIBUTES);
att += NUM_ATTRIBUTES;
if (INTEL_INFO(intel)->gen >= 030) {
memcpy((char *)att, (char *)intel_xv_gamma_attributes,
sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
sizeof(XvAttributeRec) * GAMMA_ATTRIBUTES);
}
adapt->nImages = NUM_IMAGES - XVMC_IMAGE;