ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for 32bpp emulation in the Enhanced (D3D7) blitter

This commit is contained in:
dinkc64 2014-06-14 18:33:59 +00:00
parent 7e9b286b3b
commit 02a17313ec
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/intf/video/win32/vid_d3d.cpp
View File

@ -569,18 +569,39 @@ static int vidCreateGameSurfaces()
// Determine if we should use a texture format different from the screen format // Determine if we should use a texture format different from the screen format
bForceTextureFormat = false; bForceTextureFormat = false;
if (VidSoftFXCheckDepth(nPreScaleEffect, 16) != 32 && nVidScrnDepth > 16 && if (VidSoftFXCheckDepth(nPreScaleEffect, 16) != 32 && nVidScrnDepth > 16 &&
((bDrvOkay || VidSoftFXCheckDepth(nPreScaleEffect, 32) != 32) || ((bDrvOkay && VidSoftFXCheckDepth(nPreScaleEffect, 32) != 32) ||
(bDrvOkay && (bVidForce16bit || !bDoGamma || (nVidFullscreen && bVidUseHardwareGamma) || (!nVidFullscreen && bHardwareGammaOnly))))) (bDrvOkay && (bVidForce16bit ||
(bDoGamma && nVidFullscreen && bVidUseHardwareGamma) ||
(bDoGamma && !nVidFullscreen && bHardwareGammaOnly))))
)
{ {
memset(&ddpf, 0, sizeof(DDPIXELFORMAT)); memset(&ddpf, 0, sizeof(DDPIXELFORMAT));
pD3DDevice->EnumTextureFormats(&myEnumTexturesCallback, (void*)&ddpf); pD3DDevice->EnumTextureFormats(&myEnumTexturesCallback, (void*)&ddpf);
if (ddpf.dwSize) { if (ddpf.dwSize) {
bForceTextureFormat = true; bForceTextureFormat = true; // NOTE: this makes emulation=16bpp
} }
} }
/* { // debug code for the above if-statement :)
int ii;
ii = VidSoftFXCheckDepth(nPreScaleEffect, 16) != 32 && nVidScrnDepth > 16;
bprintf(0, _T("Part1 %d "), ii);
ii = (bDrvOkay || VidSoftFXCheckDepth(nPreScaleEffect, 32) != 32);
bprintf(0, _T("Part2 %d \n"), ii);
ii = (bDoGamma && nVidFullscreen && bVidUseHardwareGamma);
bprintf(0, _T("(bDoGamma && nVidFullscreen && bVidUseHardwareGamma) == [%d]\n"), ii);
ii = (bDoGamma && !nVidFullscreen && bHardwareGammaOnly);
bprintf(0, _T("(bDoGamma && !nVidFullscreen && bHardwareGammaOnly) == [%d]\n"), ii);
bprintf(0, _T("nPreScaleEffect [%X]\n"), nPreScaleEffect);
bprintf(0, _T("VidSoftFXCheckDepth(nPreScaleEffect, 16) [%d]\n"), VidSoftFXCheckDepth(nPreScaleEffect, 16));
bprintf(0, _T("VidSoftFXCheckDepth(nPreScaleEffect, 32) [%d]\n"), VidSoftFXCheckDepth(nPreScaleEffect, 32));
bprintf(0, _T("nVidScrnDepth [%X] bDrvOkay [%X]\n"), nVidScrnDepth, bDrvOkay);
bprintf(0, _T("bVidForce16bit[%X] forcetexture[%X]\n"), bVidForce16bit, bForceTextureFormat);
bprintf(0, _T("bDoGamma [%X] nVidFullscreen [%X] bVidUseHardwareGamma [%X] bHardwareGammaOnly [%X]\n"), bDoGamma, nVidFullscreen, bVidUseHardwareGamma, bHardwareGammaOnly);
}
*/
// Create a secondary surface to render the game image onto for the feedback effect // Create a secondary surface to render the game image onto for the feedback effect
memset(&ddsd, 0, sizeof(ddsd)); memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd); ddsd.dwSize = sizeof(ddsd);