mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 15:34:13 +00:00
optimze more redirect call and start kill the bad macro DXG_GET_INDEX_FUNCTION that is instable
the dx hal for graphic interface started being bit more stable. svn path=/trunk/; revision=33012
This commit is contained in:
parent
500a6e9384
commit
4f6b4861e9
|
@ -289,10 +289,7 @@ DWORD
|
|||
STDCALL
|
||||
NtGdiDdDestroyD3DBuffer(HANDLE hSurface)
|
||||
{
|
||||
PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroyD3DBuffer, pfnDdDestroyD3DBuffer);
|
||||
PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = (PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdDestroyD3DBuffer].pfn;
|
||||
|
||||
if (pfnDdDestroyD3DBuffer == NULL)
|
||||
{
|
||||
|
@ -317,10 +314,7 @@ NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf,
|
|||
FLATPTR *pfpVidMemVtx,
|
||||
DWORD *pdwSizeVtx)
|
||||
{
|
||||
PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dDrawPrimitives2, pfnD3dDrawPrimitives2);
|
||||
PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = (PGD_D3DDRAWPRIMITIVES2)gpDxFuncs[DXG_INDEX_DxD3dDrawPrimitives2].pfn;
|
||||
|
||||
if (pfnD3dDrawPrimitives2 == NULL)
|
||||
{
|
||||
|
@ -341,10 +335,7 @@ STDCALL
|
|||
NtGdiDdLockD3D(HANDLE hSurface,
|
||||
PDD_LOCKDATA puLockData)
|
||||
{
|
||||
PGD_DXDDLOCKD3D pfnDdLockD3D = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockD3D, pfnDdLockD3D);
|
||||
PGD_DXDDLOCKD3D pfnDdLockD3D = (PGD_DXDDLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdLockD3D].pfn;
|
||||
|
||||
if (pfnDdLockD3D == NULL)
|
||||
{
|
||||
|
@ -363,10 +354,7 @@ DWORD
|
|||
STDCALL
|
||||
NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData)
|
||||
{
|
||||
PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxD3dValidateTextureStageState, pfnD3dValidateTextureStageState);
|
||||
PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = (PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DxD3dValidateTextureStageState].pfn;
|
||||
|
||||
if (pfnD3dValidateTextureStageState == NULL)
|
||||
{
|
||||
|
@ -386,10 +374,7 @@ STDCALL
|
|||
NtGdiDdUnlockD3D(HANDLE hSurface,
|
||||
PDD_UNLOCKDATA puUnlockData)
|
||||
{
|
||||
PGD_DXDDUNLOCKD3D pfnDdUnlockD3D = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockD3D, pfnDdUnlockD3D);
|
||||
PGD_DXDDUNLOCKD3D pfnDdUnlockD3D = (PGD_DXDDUNLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdUnlockD3D].pfn;
|
||||
|
||||
if (pfnDdUnlockD3D == NULL)
|
||||
{
|
||||
|
|
|
@ -25,10 +25,7 @@ NtGdiDdCreateSurface(HANDLE hDirectDrawLocal,
|
|||
PDD_CREATESURFACEDATA puCreateSurfaceData,
|
||||
HANDLE *puhSurface)
|
||||
{
|
||||
PGD_DDCREATESURFACE pfnDdCreateSurface = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateSurface, pfnDdCreateSurface);
|
||||
PGD_DDCREATESURFACE pfnDdCreateSurface = (PGD_DDCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCreateSurface].pfn;
|
||||
|
||||
if (pfnDdCreateSurface == NULL)
|
||||
{
|
||||
|
@ -49,10 +46,7 @@ STDCALL
|
|||
NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw,
|
||||
PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData)
|
||||
{
|
||||
PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdWaitForVerticalBlank, pfnDdWaitForVerticalBlank);
|
||||
PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank = (PGD_DXDDWAITFORVERTICALBLANK)gpDxFuncs[DXG_INDEX_DxDdWaitForVerticalBlank].pfn;
|
||||
|
||||
if (pfnDdWaitForVerticalBlank == NULL)
|
||||
{
|
||||
|
@ -72,10 +66,7 @@ STDCALL
|
|||
NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal,
|
||||
PDD_CANCREATESURFACEDATA puCanCreateSurfaceData)
|
||||
{
|
||||
PGD_DDCANCREATESURFACE pfnDdCanCreateSurface = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCanCreateSurface, pfnDdCanCreateSurface);
|
||||
PGD_DDCANCREATESURFACE pfnDdCanCreateSurface = (PGD_DDCANCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCanCreateSurface].pfn;
|
||||
|
||||
if (pfnDdCanCreateSurface == NULL)
|
||||
{
|
||||
|
@ -95,10 +86,7 @@ STDCALL
|
|||
NtGdiDdGetScanLine(HANDLE hDirectDrawLocal,
|
||||
PDD_GETSCANLINEDATA puGetScanLineData)
|
||||
{
|
||||
PGD_DXDDGETSCANLINE pfnDdGetScanLine = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetScanLine, pfnDdGetScanLine);
|
||||
PGD_DXDDGETSCANLINE pfnDdGetScanLine = (PGD_DXDDGETSCANLINE)gpDxFuncs[DXG_INDEX_DxDdGetScanLine].pfn;
|
||||
|
||||
if (pfnDdGetScanLine == NULL)
|
||||
{
|
||||
|
@ -125,10 +113,7 @@ NtGdiDdCreateSurfaceEx(HANDLE hDirectDraw,
|
|||
HANDLE hSurface,
|
||||
DWORD dwSurfaceHandle)
|
||||
{
|
||||
PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdCreateSurfaceEx, pfnDdCreateSurfaceEx);
|
||||
PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx = (PGD_DXDDCREATESURFACEEX)gpDxFuncs[DXG_INDEX_DxDdCreateSurfaceEx].pfn;
|
||||
|
||||
if (pfnDdCreateSurfaceEx == NULL)
|
||||
{
|
||||
|
|
|
@ -18,10 +18,7 @@ DWORD
|
|||
STDCALL
|
||||
NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy)
|
||||
{
|
||||
PGD_DXDDDESTROYSURFACE pfnDdDestroySurface = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdDestroySurface, pfnDdDestroySurface);
|
||||
PGD_DXDDDESTROYSURFACE pfnDdDestroySurface = (PGD_DXDDDESTROYSURFACE)gpDxFuncs[DXG_INDEX_DxDdDestroySurface].pfn;
|
||||
|
||||
if (pfnDdDestroySurface == NULL)
|
||||
{
|
||||
|
@ -44,10 +41,7 @@ NtGdiDdFlip(HANDLE hSurfaceCurrent,
|
|||
HANDLE hSurfaceTargetLeft,
|
||||
PDD_FLIPDATA puFlipData)
|
||||
{
|
||||
PGD_DXDDFLIP pfnDdDdFlip = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFlip, pfnDdDdFlip);
|
||||
PGD_DXDDFLIP pfnDdDdFlip = (PGD_DXDDFLIP)gpDxFuncs[DXG_INDEX_DxDdFlip].pfn;
|
||||
|
||||
if (pfnDdDdFlip == NULL)
|
||||
{
|
||||
|
@ -68,10 +62,7 @@ NtGdiDdLock(HANDLE hSurface,
|
|||
PDD_LOCKDATA puLockData,
|
||||
HDC hdcClip)
|
||||
{
|
||||
PGD_DXDDLOCK pfnDdLock = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLock, pfnDdLock);
|
||||
PGD_DXDDLOCK pfnDdLock = (PGD_DXDDLOCK)gpDxFuncs[DXG_INDEX_DxDdLock].pfn;
|
||||
|
||||
if (pfnDdLock == NULL)
|
||||
{
|
||||
|
@ -91,10 +82,7 @@ STDCALL
|
|||
NtGdiDdUnlock(HANDLE hSurface,
|
||||
PDD_UNLOCKDATA puUnlockData)
|
||||
{
|
||||
PGD_DXDDUNLOCK pfnDdUnlock = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlock, pfnDdUnlock);
|
||||
PGD_DXDDUNLOCK pfnDdUnlock = (PGD_DXDDUNLOCK)gpDxFuncs[DXG_INDEX_DxDdUnlock].pfn;
|
||||
|
||||
if (pfnDdUnlock == NULL)
|
||||
{
|
||||
|
@ -115,10 +103,7 @@ NtGdiDdBlt(HANDLE hSurfaceDest,
|
|||
HANDLE hSurfaceSrc,
|
||||
PDD_BLTDATA puBltData)
|
||||
{
|
||||
PGD_DDBLT pfnDdBlt = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdBlt, pfnDdBlt);
|
||||
PGD_DDBLT pfnDdBlt = (PGD_DDBLT)gpDxFuncs[DXG_INDEX_DxDdBlt].pfn;
|
||||
|
||||
if (pfnDdBlt == NULL)
|
||||
{
|
||||
|
@ -138,10 +123,7 @@ STDCALL
|
|||
NtGdiDdSetColorKey(HANDLE hSurface,
|
||||
PDD_SETCOLORKEYDATA puSetColorKeyData)
|
||||
{
|
||||
PGD_DXDDSETCOLORKEY pfnDdSetColorKey = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetColorKey, pfnDdSetColorKey);
|
||||
PGD_DXDDSETCOLORKEY pfnDdSetColorKey = (PGD_DXDDSETCOLORKEY)gpDxFuncs[DXG_INDEX_DxDdSetColorKey].pfn;
|
||||
|
||||
if (pfnDdSetColorKey == NULL)
|
||||
{
|
||||
|
@ -164,10 +146,7 @@ NtGdiDdAddAttachedSurface(HANDLE hSurface,
|
|||
HANDLE hSurfaceAttached,
|
||||
PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData)
|
||||
{
|
||||
PGD_DDADDATTACHEDSURFACE pfnDdAddAttachedSurface = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAddAttachedSurface, pfnDdAddAttachedSurface);
|
||||
PGD_DDADDATTACHEDSURFACE pfnDdAddAttachedSurface = (PGD_DDADDATTACHEDSURFACE)gpDxFuncs[DXG_INDEX_DxDdAddAttachedSurface].pfn;
|
||||
|
||||
if (pfnDdAddAttachedSurface == NULL)
|
||||
{
|
||||
|
@ -187,10 +166,7 @@ STDCALL
|
|||
NtGdiDdGetBltStatus(HANDLE hSurface,
|
||||
PDD_GETBLTSTATUSDATA puGetBltStatusData)
|
||||
{
|
||||
PGD_DXDDGETBLTSTATUS pfnDdGetBltStatus = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetBltStatus, pfnDdGetBltStatus);
|
||||
PGD_DXDDGETBLTSTATUS pfnDdGetBltStatus = (PGD_DXDDGETBLTSTATUS)gpDxFuncs[DXG_INDEX_DxDdGetBltStatus].pfn;
|
||||
|
||||
if (pfnDdGetBltStatus == NULL)
|
||||
{
|
||||
|
@ -210,10 +186,7 @@ STDCALL
|
|||
NtGdiDdGetFlipStatus(HANDLE hSurface,
|
||||
PDD_GETFLIPSTATUSDATA puGetFlipStatusData)
|
||||
{
|
||||
PGD_DXDDGETFLIPSTATUS pfnDdGetFlipStatus = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetFlipStatus, pfnDdGetFlipStatus);
|
||||
PGD_DXDDGETFLIPSTATUS pfnDdGetFlipStatus = (PGD_DXDDGETFLIPSTATUS)gpDxFuncs[DXG_INDEX_DxDdGetFlipStatus].pfn;
|
||||
|
||||
if (pfnDdGetFlipStatus == NULL)
|
||||
{
|
||||
|
@ -234,10 +207,7 @@ NtGdiDdUpdateOverlay(HANDLE hSurfaceDestination,
|
|||
HANDLE hSurfaceSource,
|
||||
PDD_UPDATEOVERLAYDATA puUpdateOverlayData)
|
||||
{
|
||||
PGD_DXDDUPDATEOVERLAY pfnDdUpdateOverlay = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUpdateOverlay, pfnDdUpdateOverlay);
|
||||
PGD_DXDDUPDATEOVERLAY pfnDdUpdateOverlay = (PGD_DXDDUPDATEOVERLAY)gpDxFuncs[DXG_INDEX_DxDdUpdateOverlay].pfn;
|
||||
|
||||
if (pfnDdUpdateOverlay == NULL)
|
||||
{
|
||||
|
@ -259,10 +229,7 @@ NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource,
|
|||
HANDLE hSurfaceDestination,
|
||||
PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData)
|
||||
{
|
||||
PGD_DXDDSETOVERLAYPOSITION pfnDdSetOverlayPosition = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetOverlayPosition, pfnDdSetOverlayPosition);
|
||||
PGD_DXDDSETOVERLAYPOSITION pfnDdSetOverlayPosition = (PGD_DXDDSETOVERLAYPOSITION)gpDxFuncs[DXG_INDEX_DxDdSetOverlayPosition].pfn;
|
||||
|
||||
if (pfnDdSetOverlayPosition == NULL)
|
||||
{
|
||||
|
@ -289,10 +256,7 @@ NtGdiDdAlphaBlt(HANDLE hSurfaceDest,
|
|||
HANDLE hSurfaceSrc,
|
||||
PDD_BLTDATA puBltData)
|
||||
{
|
||||
PGD_DDALPHABLT pfnDdAlphaBlt = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAlphaBlt, pfnDdAlphaBlt);
|
||||
PGD_DDALPHABLT pfnDdAlphaBlt = (PGD_DDALPHABLT)gpDxFuncs[DXG_INDEX_DxDdAlphaBlt].pfn;
|
||||
|
||||
if (pfnDdAlphaBlt == NULL)
|
||||
{
|
||||
|
@ -313,10 +277,7 @@ NtGdiDdAttachSurface(HANDLE hSurfaceFrom,
|
|||
HANDLE hSurfaceTo
|
||||
)
|
||||
{
|
||||
PGD_DDATTACHSURFACE pfnDdAttachSurface = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAttachSurface, pfnDdAttachSurface);
|
||||
PGD_DDATTACHSURFACE pfnDdAttachSurface = (PGD_DDATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdAttachSurface].pfn;
|
||||
|
||||
if (pfnDdAttachSurface == NULL)
|
||||
{
|
||||
|
@ -340,11 +301,7 @@ STDCALL
|
|||
NtGdiDdUnattachSurface(HANDLE hSurface,
|
||||
HANDLE hSurfaceAttached)
|
||||
{
|
||||
PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnattachSurface, pfnDdUnattachSurface);
|
||||
|
||||
PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn;
|
||||
if (pfnDdUnattachSurface == NULL)
|
||||
{
|
||||
DPRINT1("Warring no pfnDdUnattachSurface");
|
||||
|
|
|
@ -21,10 +21,7 @@ STDCALL
|
|||
NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw,
|
||||
PDD_CANCREATEVPORTDATA puCanCreateVPortData)
|
||||
{
|
||||
PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpCanCreateVideoPort, pfnDvpCanCreateVideoPort);
|
||||
PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort = (PGD_DVPCANCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCanCreateVideoPort].pfn;
|
||||
|
||||
if (pfnDvpCanCreateVideoPort == NULL)
|
||||
{
|
||||
|
@ -44,10 +41,7 @@ STDCALL
|
|||
NtGdiDvpColorControl(HANDLE hVideoPort,
|
||||
PDD_VPORTCOLORDATA puVPortColorData)
|
||||
{
|
||||
PGD_DVPCOLORCONTROL pfnDvpColorControl = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpColorControl, pfnDvpColorControl);
|
||||
PGD_DVPCOLORCONTROL pfnDvpColorControl = (PGD_DVPCOLORCONTROL)gpDxFuncs[DXG_INDEX_DxDvpColorControl].pfn;
|
||||
|
||||
if (pfnDvpColorControl == NULL)
|
||||
{
|
||||
|
@ -67,10 +61,7 @@ STDCALL
|
|||
NtGdiDvpCreateVideoPort(HANDLE hDirectDraw,
|
||||
PDD_CREATEVPORTDATA puCreateVPortData)
|
||||
{
|
||||
PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpCreateVideoPort, pfnDvpCreateVideoPort);
|
||||
PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort = (PGD_DVPCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCreateVideoPort].pfn;
|
||||
|
||||
if (pfnDvpCreateVideoPort == NULL)
|
||||
{
|
||||
|
@ -90,10 +81,7 @@ STDCALL
|
|||
NtGdiDvpDestroyVideoPort(HANDLE hVideoPort,
|
||||
PDD_DESTROYVPORTDATA puDestroyVPortData)
|
||||
{
|
||||
PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = NULL;
|
||||
INT i;
|
||||
|
||||
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDvpDestroyVideoPort, pfnDvpDestroyVideoPort);
|
||||
PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = (PGD_DVPDESTROYVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpDestroyVideoPort].pfn;
|
||||
|
||||
if (pfnDvpDestroyVideoPort == NULL)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue