frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ce2bcc0a4f into d403cbd25c

This commit is contained in:
Enrico Weigelt 2025-07-04 11:12:55 -07:00 committed by GitHub
parent d403cbd25c ce2bcc0a4f
commit 89ad932973
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
miext/damage/damage.c
View File

@ -1714,7 +1714,8 @@ DamageCreate(DamageReportFunc damageReport,
pDamage->damageDestroy = damageDestroy; pDamage->damageDestroy = damageDestroy;
pDamage->pScreen = pScreen; pDamage->pScreen = pScreen;
(*pScrPriv->funcs.Create) (pDamage); if (pScrPriv->funcs.Create)
pScrPriv->funcs.Create (pDamage);
return pDamage; return pDamage;
} }
@ -1755,7 +1756,8 @@ DamageRegister(DrawablePtr pDrawable, DamagePtr pDamage)
pDamage->isWindow = FALSE; pDamage->isWindow = FALSE;
pDamage->pDrawable = pDrawable; pDamage->pDrawable = pDrawable;
damageInsertDamage(getDrawableDamageRef(pDrawable), pDamage); damageInsertDamage(getDrawableDamageRef(pDrawable), pDamage);
(*pScrPriv->funcs.Register) (pDrawable, pDamage); if (pScrPriv->funcs.Register)
pScrPriv->funcs.Register (pDrawable, pDamage);
} }
void void
@ -1774,7 +1776,8 @@ DamageUnregister(DamagePtr pDamage)
damageScrPriv(pScreen); damageScrPriv(pScreen);
(*pScrPriv->funcs.Unregister) (pDrawable, pDamage); if (pScrPriv->funcs.Unregister)
pScrPriv->funcs.Unregister (pDrawable, pDamage);
if (pDrawable->type == DRAWABLE_WINDOW) { if (pDrawable->type == DRAWABLE_WINDOW) {
WindowPtr pWindow = (WindowPtr) pDrawable; WindowPtr pWindow = (WindowPtr) pDrawable;
@ -1817,7 +1820,10 @@ DamageDestroy(DamagePtr pDamage)
if (pDamage->damageDestroy) if (pDamage->damageDestroy)
(*pDamage->damageDestroy) (pDamage, pDamage->closure); (*pDamage->damageDestroy) (pDamage, pDamage->closure);
(*pScrPriv->funcs.Destroy) (pDamage);
if (pScrPriv->funcs.Destroy)
pScrPriv->funcs.Destroy (pDamage);
RegionUninit(&pDamage->damage); RegionUninit(&pDamage->damage);
RegionUninit(&pDamage->pendingDamage); RegionUninit(&pDamage->pendingDamage);
free(pDamage); free(pDamage);

15
miext/damage/damage.h
View File

@ -46,6 +46,21 @@ typedef void (*DamageScreenRegisterFunc) (DrawablePtr, DamagePtr);
typedef void (*DamageScreenUnregisterFunc) (DrawablePtr, DamagePtr); typedef void (*DamageScreenUnregisterFunc) (DrawablePtr, DamagePtr);
typedef void (*DamageScreenDestroyFunc) (DamagePtr); typedef void (*DamageScreenDestroyFunc) (DamagePtr);
/* @public
*
* @brief Driver callbacks for getting notified on several damage calls
*
* The pointer to this struct can be obtained via DamageGetScreenFuncs().
* Drivers can inject themselves here, in order to get notified on
* DamageCreate(), DamageRegister(), DamageUnregister(), DamageDestroy().
*
* The fields may be assigned to NULL, if no action at all is wanted.
* (by default assigned to default implementations)
*
* This should ONLY be touched by video drivers, nobody else.
*
* So far the only one using it is the proprietary NVidia driver.
*/
typedef struct _damageScreenFuncs { typedef struct _damageScreenFuncs {
DamageScreenCreateFunc Create; DamageScreenCreateFunc Create;
DamageScreenRegisterFunc Register; DamageScreenRegisterFunc Register;