Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-03 19:51:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move xform data from W structure into DcLevel within unions. Why: Sticking with systems floating point and reducing the size of DC.

Browse source 
svn path=/trunk/; revision=33830
This commit is contained in:
James Tabor 2008-06-02 19:51:04 +00:00
parent 720d38711f
commit b0c65c30fe
7 changed files with 61 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/subsystems/win32/win32k/include/dc.h
View file

@ -65,11 +65,6 @@ typedef struct _WIN_DC_INFO
/* #endif */ /* #endif */
BYTE bitsPerPixel; BYTE bitsPerPixel;
XFORM xformWorld2Wnd; /* World-to-window transformation */
XFORM xformWorld2Vport; /* World-to-viewport transformation */
XFORM xformVport2World; /* Inverse of the above transformation */
BOOL vport2WorldValid; /* Is xformVport2World valid? */
} WIN_DC_INFO; } WIN_DC_INFO;
// EXtended CLip and Window Region Object // EXtended CLip and Window Region Object
@ -107,9 +102,18 @@ typedef struct _DCLEVEL
DWORD unk4_00000000[11]; DWORD unk4_00000000[11];
FLONG fl; FLONG fl;
FLONG flBrush; FLONG flBrush;
union{
MATRIX_S mxWorldToDevice; MATRIX_S mxWorldToDevice;
XFORM xformWorld2Vport; /* World-to-viewport transformation */
};
union{
MATRIX_S mxDeviceToWorld; MATRIX_S mxDeviceToWorld;
XFORM xformVport2World; /* Inverse of the above transformation */
};
union{
MATRIX_S mxWorldToPage; MATRIX_S mxWorldToPage;
XFORM xformWorld2Wnd; /* World-to-window transformation */
};
EFLOAT_S efM11PtoD; EFLOAT_S efM11PtoD;
EFLOAT_S efM22PtoD; EFLOAT_S efM22PtoD;
EFLOAT_S efDxPtoD; EFLOAT_S efDxPtoD;

12
reactos/subsystems/win32/win32k/include/gdifloat.h
View file

@ -33,12 +33,12 @@ static __inline void INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point)
/* Perform the transformation */ /* Perform the transformation */
x = point->x; x = point->x;
y = point->y; y = point->y;
point->x = x * dc->w.xformWorld2Vport.eM11 + point->x = x * dc->DcLevel.xformWorld2Vport.eM11 +
y * dc->w.xformWorld2Vport.eM21 + y * dc->DcLevel.xformWorld2Vport.eM21 +
dc->w.xformWorld2Vport.eDx; dc->DcLevel.xformWorld2Vport.eDx;
point->y = x * dc->w.xformWorld2Vport.eM12 + point->y = x * dc->DcLevel.xformWorld2Vport.eM12 +
y * dc->w.xformWorld2Vport.eM22 + y * dc->DcLevel.xformWorld2Vport.eM22 +
dc->w.xformWorld2Vport.eDy; dc->DcLevel.xformWorld2Vport.eDy;
} }
/* Performs a viewport-to-world transformation on the specified point (which /* Performs a viewport-to-world transformation on the specified point (which

36
reactos/subsystems/win32/win32k/objects/coord.c
View file

@ -150,10 +150,10 @@ CoordDPtoLP(PDC Dc, LPPOINT Point)
FLOAT x, y; FLOAT x, y;
x = (FLOAT)Point->x; x = (FLOAT)Point->x;
y = (FLOAT)Point->y; y = (FLOAT)Point->y;
Point->x = x * Dc->w.xformVport2World.eM11 + Point->x = x * Dc->DcLevel.xformVport2World.eM11 +
y * Dc->w.xformVport2World.eM21 + Dc->w.xformVport2World.eDx; y * Dc->DcLevel.xformVport2World.eM21 + Dc->DcLevel.xformVport2World.eDx;
Point->y = x * Dc->w.xformVport2World.eM12 + Point->y = x * Dc->DcLevel.xformVport2World.eM12 +
y * Dc->w.xformVport2World.eM22 + Dc->w.xformVport2World.eDy; y * Dc->DcLevel.xformVport2World.eM22 + Dc->DcLevel.xformVport2World.eDy;
} }
VOID VOID
@ -190,24 +190,24 @@ IntGdiModifyWorldTransform(PDC pDc,
switch(Mode) switch(Mode)
{ {
case MWT_IDENTITY: case MWT_IDENTITY:
pDc->w.xformWorld2Wnd.eM11 = 1.0f; pDc->DcLevel.xformWorld2Wnd.eM11 = 1.0f;
pDc->w.xformWorld2Wnd.eM12 = 0.0f; pDc->DcLevel.xformWorld2Wnd.eM12 = 0.0f;
pDc->w.xformWorld2Wnd.eM21 = 0.0f; pDc->DcLevel.xformWorld2Wnd.eM21 = 0.0f;
pDc->w.xformWorld2Wnd.eM22 = 1.0f; pDc->DcLevel.xformWorld2Wnd.eM22 = 1.0f;
pDc->w.xformWorld2Wnd.eDx = 0.0f; pDc->DcLevel.xformWorld2Wnd.eDx = 0.0f;
pDc->w.xformWorld2Wnd.eDy = 0.0f; pDc->DcLevel.xformWorld2Wnd.eDy = 0.0f;
break; break;
case MWT_LEFTMULTIPLY: case MWT_LEFTMULTIPLY:
IntGdiCombineTransform(&pDc->w.xformWorld2Wnd, lpXForm, &pDc->w.xformWorld2Wnd ); IntGdiCombineTransform(&pDc->DcLevel.xformWorld2Wnd, lpXForm, &pDc->DcLevel.xformWorld2Wnd );
break; break;
case MWT_RIGHTMULTIPLY: case MWT_RIGHTMULTIPLY:
IntGdiCombineTransform(&pDc->w.xformWorld2Wnd, &pDc->w.xformWorld2Wnd, lpXForm); IntGdiCombineTransform(&pDc->DcLevel.xformWorld2Wnd, &pDc->DcLevel.xformWorld2Wnd, lpXForm);
break; break;
case MWT_MAX+1: // Must be MWT_SET???? case MWT_MAX+1: // Must be MWT_SET????
pDc->w.xformWorld2Wnd = *lpXForm; // Do it like Wine. pDc->DcLevel.xformWorld2Wnd = *lpXForm; // Do it like Wine.
break; break;
default: default:
@ -248,7 +248,7 @@ NtGdiGetTransform(HDC hDC,
switch(iXform) switch(iXform)
{ {
case GdiWorldSpaceToPageSpace: case GdiWorldSpaceToPageSpace:
*XForm = dc->w.xformWorld2Wnd; *XForm = dc->DcLevel.xformWorld2Wnd;
break; break;
default: default:
break; break;
@ -275,10 +275,10 @@ CoordLPtoDP ( PDC Dc, LPPOINT Point )
x = (FLOAT)Point->x; x = (FLOAT)Point->x;
y = (FLOAT)Point->y; y = (FLOAT)Point->y;
Point->x = x * Dc->w.xformWorld2Vport.eM11 + Point->x = x * Dc->DcLevel.xformWorld2Vport.eM11 +
y * Dc->w.xformWorld2Vport.eM21 + Dc->w.xformWorld2Vport.eDx; y * Dc->DcLevel.xformWorld2Vport.eM21 + Dc->DcLevel.xformWorld2Vport.eDx;
Point->y = x * Dc->w.xformWorld2Vport.eM12 + Point->y = x * Dc->DcLevel.xformWorld2Vport.eM12 +
y * Dc->w.xformWorld2Vport.eM22 + Dc->w.xformWorld2Vport.eDy; y * Dc->DcLevel.xformWorld2Vport.eM22 + Dc->DcLevel.xformWorld2Vport.eDy;
} }
VOID VOID

41
reactos/subsystems/win32/win32k/objects/dc.c
View file

@ -1336,10 +1336,10 @@ IntGdiCopyToSaveState(PDC dc, PDC newdc)
nDc_Attr->ptlCurrent = Dc_Attr->ptlCurrent; nDc_Attr->ptlCurrent = Dc_Attr->ptlCurrent;
nDc_Attr->ptfxCurrent = Dc_Attr->ptfxCurrent; nDc_Attr->ptfxCurrent = Dc_Attr->ptfxCurrent;
newdc->DcLevel.flPath = dc->DcLevel.flPath; newdc->DcLevel.flPath = dc->DcLevel.flPath;
newdc->w.xformWorld2Wnd = dc->w.xformWorld2Wnd; newdc->DcLevel.xformWorld2Wnd = dc->DcLevel.xformWorld2Wnd;
newdc->w.xformWorld2Vport = dc->w.xformWorld2Vport; newdc->DcLevel.xformWorld2Vport = dc->DcLevel.xformWorld2Vport;
newdc->w.xformVport2World = dc->w.xformVport2World; newdc->DcLevel.xformVport2World = dc->DcLevel.xformVport2World;
newdc->w.vport2WorldValid = dc->w.vport2WorldValid; nDc_Attr->flXform = Dc_Attr->flXform;
nDc_Attr->ptlWindowOrg = Dc_Attr->ptlWindowOrg; nDc_Attr->ptlWindowOrg = Dc_Attr->ptlWindowOrg;
nDc_Attr->szlWindowExt = Dc_Attr->szlWindowExt; nDc_Attr->szlWindowExt = Dc_Attr->szlWindowExt;
nDc_Attr->ptlViewportOrg = Dc_Attr->ptlViewportOrg; nDc_Attr->ptlViewportOrg = Dc_Attr->ptlViewportOrg;
@ -1403,10 +1403,10 @@ IntGdiCopyFromSaveState(PDC dc, PDC dcs, HDC hDC)
Dc_Attr->ptlCurrent = sDc_Attr->ptlCurrent; Dc_Attr->ptlCurrent = sDc_Attr->ptlCurrent;
Dc_Attr->ptfxCurrent = sDc_Attr->ptfxCurrent; Dc_Attr->ptfxCurrent = sDc_Attr->ptfxCurrent;
dc->DcLevel.flPath = dcs->DcLevel.flPath; dc->DcLevel.flPath = dcs->DcLevel.flPath;
dc->w.xformWorld2Wnd = dcs->w.xformWorld2Wnd; dc->DcLevel.xformWorld2Wnd = dcs->DcLevel.xformWorld2Wnd;
dc->w.xformWorld2Vport = dcs->w.xformWorld2Vport; dc->DcLevel.xformWorld2Vport = dcs->DcLevel.xformWorld2Vport;
dc->w.xformVport2World = dcs->w.xformVport2World; dc->DcLevel.xformVport2World = dcs->DcLevel.xformVport2World;
dc->w.vport2WorldValid = dcs->w.vport2WorldValid; Dc_Attr->flXform = sDc_Attr->flXform;
Dc_Attr->ptlWindowOrg = sDc_Attr->ptlWindowOrg; Dc_Attr->ptlWindowOrg = sDc_Attr->ptlWindowOrg;
Dc_Attr->szlWindowExt = sDc_Attr->szlWindowExt; Dc_Attr->szlWindowExt = sDc_Attr->szlWindowExt;
Dc_Attr->ptlViewportOrg = sDc_Attr->ptlViewportOrg; Dc_Attr->ptlViewportOrg = sDc_Attr->ptlViewportOrg;
@ -2405,16 +2405,14 @@ DC_AllocDC(PUNICODE_STRING Driver)
if(!Dc_Attr) Dc_Attr = &NewDC->Dc_Attr; if(!Dc_Attr) Dc_Attr = &NewDC->Dc_Attr;
NewDC->BaseObject.hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. NewDC->BaseObject.hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object.
NewDC->w.xformWorld2Wnd.eM11 = 1.0f; NewDC->DcLevel.xformWorld2Wnd.eM11 = 1.0f;
NewDC->w.xformWorld2Wnd.eM12 = 0.0f; NewDC->DcLevel.xformWorld2Wnd.eM12 = 0.0f;
NewDC->w.xformWorld2Wnd.eM21 = 0.0f; NewDC->DcLevel.xformWorld2Wnd.eM21 = 0.0f;
NewDC->w.xformWorld2Wnd.eM22 = 1.0f; NewDC->DcLevel.xformWorld2Wnd.eM22 = 1.0f;
NewDC->w.xformWorld2Wnd.eDx = 0.0f; NewDC->DcLevel.xformWorld2Wnd.eDx = 0.0f;
NewDC->w.xformWorld2Wnd.eDy = 0.0f; NewDC->DcLevel.xformWorld2Wnd.eDy = 0.0f;
NewDC->w.xformWorld2Vport = NewDC->w.xformWorld2Wnd; NewDC->DcLevel.xformWorld2Vport = NewDC->DcLevel.xformWorld2Wnd;
NewDC->w.xformVport2World = NewDC->w.xformWorld2Wnd; NewDC->DcLevel.xformVport2World = NewDC->DcLevel.xformWorld2Wnd;
NewDC->w.vport2WorldValid = TRUE;
// Setup syncing bits for the dcattr data packets. // Setup syncing bits for the dcattr data packets.
Dc_Attr->flXform = DEVICE_TO_PAGE_INVALID; Dc_Attr->flXform = DEVICE_TO_PAGE_INVALID;
@ -2603,10 +2601,13 @@ DC_UpdateXforms(PDC dc)
xformWnd2Vport.eDy = (FLOAT)Dc_Attr->ptlViewportOrg.y - scaleY * (FLOAT)Dc_Attr->ptlWindowOrg.y; xformWnd2Vport.eDy = (FLOAT)Dc_Attr->ptlViewportOrg.y - scaleY * (FLOAT)Dc_Attr->ptlWindowOrg.y;
/* Combine with the world transformation */ /* Combine with the world transformation */
IntGdiCombineTransform(&dc->w.xformWorld2Vport, &dc->w.xformWorld2Wnd, &xformWnd2Vport); IntGdiCombineTransform(&dc->DcLevel.xformWorld2Vport, &dc->DcLevel.xformWorld2Wnd, &xformWnd2Vport);
/* Create inverse of world-to-viewport transformation */ /* Create inverse of world-to-viewport transformation */
dc->w.vport2WorldValid = DC_InvertXform(&dc->w.xformWorld2Vport, &dc->w.xformVport2World); if (DC_InvertXform(&dc->DcLevel.xformWorld2Vport, &dc->DcLevel.xformVport2World))
Dc_Attr->flXform &= ~DEVICE_TO_WORLD_INVALID;
else
Dc_Attr->flXform |= DEVICE_TO_WORLD_INVALID;
} }
BOOL FASTCALL BOOL FASTCALL

6
reactos/subsystems/win32/win32k/objects/dcutil.c
View file

@ -113,9 +113,9 @@ VOID
CopytoUserDcAttr(PDC dc, PDC_ATTR Dc_Attr) CopytoUserDcAttr(PDC dc, PDC_ATTR Dc_Attr)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
XForm2MatrixS( &dc->Dc_Attr.mxWorldToDevice, &dc->w.xformWorld2Vport); XForm2MatrixS( &dc->Dc_Attr.mxWorldToDevice, &dc->DcLevel.xformWorld2Vport);
XForm2MatrixS( &dc->Dc_Attr.mxDevicetoWorld, &dc->w.xformVport2World); XForm2MatrixS( &dc->Dc_Attr.mxDevicetoWorld, &dc->DcLevel.xformVport2World);
XForm2MatrixS( &dc->Dc_Attr.mxWorldToPage, &dc->w.xformWorld2Wnd); XForm2MatrixS( &dc->Dc_Attr.mxWorldToPage, &dc->DcLevel.xformWorld2Wnd);
_SEH_TRY _SEH_TRY
{ {
ProbeForWrite( Dc_Attr, ProbeForWrite( Dc_Attr,

6
reactos/subsystems/win32/win32k/objects/path.c
View file

@ -431,7 +431,7 @@ PATH_FillPath( PDC dc, GdiPath *pPath )
* tests show that resetting the graphics mode to GM_COMPATIBLE does * tests show that resetting the graphics mode to GM_COMPATIBLE does
* not reset the world transform. * not reset the world transform.
*/ */
xform = dc->w.xformWorld2Wnd; xform = dc->DcLevel.xformWorld2Wnd;
/* Set MM_TEXT */ /* Set MM_TEXT */
IntGdiSetMapMode( dc, MM_TEXT ); IntGdiSetMapMode( dc, MM_TEXT );
@ -1493,7 +1493,7 @@ BOOL FASTCALL PATH_StrokePath(DC *dc, GdiPath *pPath)
IntGetViewportOrgEx(dc, &ptViewportOrg); IntGetViewportOrgEx(dc, &ptViewportOrg);
IntGetWindowExtEx(dc, &szWindowExt); IntGetWindowExtEx(dc, &szWindowExt);
IntGetWindowOrgEx(dc, &ptWindowOrg); IntGetWindowOrgEx(dc, &ptWindowOrg);
xform = dc->w.xformWorld2Wnd; xform = dc->DcLevel.xformWorld2Wnd;
/* Set MM_TEXT */ /* Set MM_TEXT */
Dc_Attr->iMapMode = MM_TEXT; Dc_Attr->iMapMode = MM_TEXT;
@ -1621,7 +1621,7 @@ end:
Dc_Attr->ptlViewportOrg.y = ptViewportOrg.y; Dc_Attr->ptlViewportOrg.y = ptViewportOrg.y;
/* Restore the world transform */ /* Restore the world transform */
dc->w.xformWorld2Wnd = xform; dc->DcLevel.xformWorld2Wnd = xform;
/* If we've moved the current point then get its new position /* If we've moved the current point then get its new position
which will be in device (MM_TEXT) co-ords, convert it to which will be in device (MM_TEXT) co-ords, convert it to

2
reactos/subsystems/win32/win32k/objects/text.c
View file

@ -2613,7 +2613,7 @@ NtGdiGetGlyphOutline(
} }
Dc_Attr = dc->pDc_Attr; Dc_Attr = dc->pDc_Attr;
if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
eM11 = dc->w.xformWorld2Vport.eM11; eM11 = dc->DcLevel.xformWorld2Vport.eM11;
hFont = Dc_Attr->hlfntNew; hFont = Dc_Attr->hlfntNew;
TextObj = TEXTOBJ_LockText(hFont); TextObj = TEXTOBJ_LockText(hFont);
DC_UnlockDc(dc); DC_UnlockDc(dc);