ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HLE D3D : Fixed Clear Z argument to be 1.0 once again. 

Also:
* renamed g_bHasZBuffer into g_bHasDepthStencil,
* Renamed g_pCachedZStencilSurface into g_pCachedDepthStencil,
* added missing Parent field to X_D3DSurface,
* constantified 0x8000BEEF into X_D3DRESOURCE_LOCK_PALETTE.
This commit is contained in:
PatrickvL 2017-03-14 11:17:36 +01:00
parent 0ee82e6837
commit 7bda6fa152
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -94,7 +94,7 @@ static XTL::D3DSWAPCALLBACK g_pSwapCallback = NULL; // Swap/Present callback r
static XTL::D3DCALLBACK g_pCallback = NULL; // D3DDevice::InsertCallback routine static XTL::D3DCALLBACK g_pCallback = NULL; // D3DDevice::InsertCallback routine
static XTL::X_D3DCALLBACKTYPE g_CallbackType; // Callback type static XTL::X_D3DCALLBACKTYPE g_CallbackType; // Callback type
static DWORD g_CallbackParam; // Callback param static DWORD g_CallbackParam; // Callback param
static BOOL g_bHasZBuffer = FALSE; // Does device have Z Buffer? static BOOL g_bHasDepthStencil = FALSE; // Does device have a Depth/Stencil Buffer?
//static DWORD g_dwPrimPerFrame = 0; // Number of primitives within one frame //static DWORD g_dwPrimPerFrame = 0; // Number of primitives within one frame
// D3D based variables // D3D based variables
@ -130,7 +130,7 @@ static DWORD g_SwapLast = 0;
// cached Direct3D state variable(s) // cached Direct3D state variable(s)
static XTL::X_D3DSurface *g_pCachedRenderTarget = NULL; static XTL::X_D3DSurface *g_pCachedRenderTarget = NULL;
static XTL::X_D3DSurface *g_pCachedZStencilSurface = NULL; static XTL::X_D3DSurface *g_pCachedDepthStencil = NULL;
static XTL::X_D3DSurface *g_pCachedYuvSurface = NULL; static XTL::X_D3DSurface *g_pCachedYuvSurface = NULL;
static BOOL g_fYuvEnabled = FALSE; static BOOL g_fYuvEnabled = FALSE;
static DWORD g_dwVertexShaderUsage = 0; static DWORD g_dwVertexShaderUsage = 0;
@ -983,10 +983,10 @@ static DWORD WINAPI EmuCreateDeviceProxy(LPVOID)
g_pD3DDevice8->GetRenderTarget(&g_pCachedRenderTarget->EmuSurface8); g_pD3DDevice8->GetRenderTarget(&g_pCachedRenderTarget->EmuSurface8);
// update z-stencil surface cache // update z-stencil surface cache
g_pCachedZStencilSurface = new XTL::X_D3DSurface(); g_pCachedDepthStencil = new XTL::X_D3DSurface();
g_pCachedZStencilSurface->Common = 0; g_pCachedDepthStencil->Common = 0;
g_pCachedZStencilSurface->Data = X_D3DRESOURCE_DATA_DEPTH_STENCIL; g_pCachedDepthStencil->Data = X_D3DRESOURCE_DATA_DEPTH_STENCIL;
g_bHasZBuffer = SUCCEEDED(g_pD3DDevice8->GetDepthStencilSurface(&g_pCachedZStencilSurface->EmuSurface8)); g_bHasDepthStencil = SUCCEEDED(g_pD3DDevice8->GetDepthStencilSurface(&g_pCachedDepthStencil->EmuSurface8));
(void)g_pD3DDevice8->CreateVertexBuffer (void)g_pD3DDevice8->CreateVertexBuffer
( (
1, 0, 0, XTL::D3DPOOL_MANAGED, 1, 0, 0, XTL::D3DPOOL_MANAGED,
@ -1007,9 +1007,9 @@ static DWORD WINAPI EmuCreateDeviceProxy(LPVOID)
g_pD3DDevice8->Clear( g_pD3DDevice8->Clear(
/*Count=*/0, /*Count=*/0,
/*pRects=*/nullptr, /*pRects=*/nullptr,
D3DCLEAR_TARGET | (g_bHasZBuffer ? D3DCLEAR_ZBUFFER|D3DCLEAR_STENCIL : 0), D3DCLEAR_TARGET | (g_bHasDepthStencil ? D3DCLEAR_ZBUFFER|D3DCLEAR_STENCIL : 0),
/*Color=*/0xFF000000, // TODO : Use constant for this /*Color=*/0xFF000000, // TODO : Use constant for this
/*Z=*/0.0f, /*Z=*/g_bHasDepthStencil ? 1.0f : 0.0f,
/*Stencil=*/0); /*Stencil=*/0);
g_pD3DDevice8->BeginScene(); g_pD3DDevice8->BeginScene();
g_pD3DDevice8->EndScene(); g_pD3DDevice8->EndScene();
@ -2289,12 +2289,12 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetDepthStencilSurface)
");\n", ");\n",
ppZStencilSurface); ppZStencilSurface);
IDirect3DSurface8 *pSurface8 = g_pCachedZStencilSurface->EmuSurface8; IDirect3DSurface8 *pSurface8 = g_pCachedDepthStencil->EmuSurface8;
if(pSurface8 != 0) if(pSurface8 != 0)
pSurface8->AddRef(); pSurface8->AddRef();
*ppZStencilSurface = g_pCachedZStencilSurface; *ppZStencilSurface = g_pCachedDepthStencil;
DbgPrintf("EmuD3D8: DepthStencilSurface := 0x%.08X\n", pSurface8); DbgPrintf("EmuD3D8: DepthStencilSurface := 0x%.08X\n", pSurface8);
@ -2312,7 +2312,7 @@ XTL::X_D3DSurface * WINAPI XTL::EMUPATCH(D3DDevice_GetDepthStencilSurface2)()
DbgPrintf("EmuD3D8: EmuD3DDevice_GetDepthStencilSurface2()\n"); DbgPrintf("EmuD3D8: EmuD3DDevice_GetDepthStencilSurface2()\n");
IDirect3DSurface8 *pSurface8 = g_pCachedZStencilSurface->EmuSurface8; IDirect3DSurface8 *pSurface8 = g_pCachedDepthStencil->EmuSurface8;
if(pSurface8 != 0) if(pSurface8 != 0)
pSurface8->AddRef(); pSurface8->AddRef();
@ -2321,7 +2321,7 @@ XTL::X_D3DSurface * WINAPI XTL::EMUPATCH(D3DDevice_GetDepthStencilSurface2)()
return g_pCachedZStencilSurface; return g_pCachedDepthStencil;
} }
// ****************************************************************** // ******************************************************************
@ -4121,7 +4121,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_Clear)
// Do not needlessly clear Z Buffer // Do not needlessly clear Z Buffer
if (Flags & X_D3DCLEAR_ZBUFFER) { if (Flags & X_D3DCLEAR_ZBUFFER) {
if (g_bHasZBuffer) if (g_bHasDepthStencil)
newFlags |= D3DCLEAR_ZBUFFER; newFlags |= D3DCLEAR_ZBUFFER;
else else
EmuWarning("Unsupported : D3DCLEAR_ZBUFFER flag for D3DDevice_Clear without ZBuffer"); EmuWarning("Unsupported : D3DCLEAR_ZBUFFER flag for D3DDevice_Clear without ZBuffer");
@ -4132,7 +4132,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_Clear)
// Avoids following DirectX Debug Runtime error report // Avoids following DirectX Debug Runtime error report
// [424] Direct3D8: (ERROR) :Invalid flag D3DCLEAR_ZBUFFER: no zbuffer is associated with device. Clear failed. // [424] Direct3D8: (ERROR) :Invalid flag D3DCLEAR_ZBUFFER: no zbuffer is associated with device. Clear failed.
if (Flags & X_D3DCLEAR_STENCIL) { if (Flags & X_D3DCLEAR_STENCIL) {
if (g_bHasZBuffer) // TODO : Introduce/use g_bHasStencil if (g_bHasDepthStencil) // TODO : Introduce/use g_bHasStencil
newFlags |= D3DCLEAR_STENCIL; newFlags |= D3DCLEAR_STENCIL;
else else
EmuWarning("Unsupported : D3DCLEAR_STENCIL flag for D3DDevice_Clear without ZBuffer"); EmuWarning("Unsupported : D3DCLEAR_STENCIL flag for D3DDevice_Clear without ZBuffer");
@ -5020,7 +5020,7 @@ ULONG WINAPI XTL::EMUPATCH(D3DResource_AddRef)
{ {
IDirect3DResource8 *pResource8 = pThis->EmuResource8; IDirect3DResource8 *pResource8 = pThis->EmuResource8;
if(pThis->Lock == 0x8000BEEF) if(pThis->Lock == X_D3DRESOURCE_LOCK_PALETTE)
uRet = ++pThis->Lock; uRet = ++pThis->Lock;
else if(pResource8 != 0) else if(pResource8 != 0)
uRet = pResource8->AddRef(); uRet = pResource8->AddRef();
@ -5082,7 +5082,7 @@ ULONG WINAPI XTL::EMUPATCH(D3DResource_Release)
{ {
IDirect3DResource8 *pResource8 = pThis->EmuResource8; IDirect3DResource8 *pResource8 = pThis->EmuResource8;
if(pThis->Lock == 0x8000BEEF) if(pThis->Lock == X_D3DRESOURCE_LOCK_PALETTE)
{ {
delete[] (PVOID)pThis->Data; delete[] (PVOID)pThis->Data;
uRet = --pThis->Lock; uRet = --pThis->Lock;
@ -8125,7 +8125,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetRenderTarget)
} }
else else
{ {
pPCNewZStencil = g_pCachedZStencilSurface->EmuSurface8; pPCNewZStencil = g_pCachedDepthStencil->EmuSurface8;
} }
} }
@ -8183,7 +8183,7 @@ XTL::X_D3DPalette * WINAPI XTL::EMUPATCH(D3DDevice_CreatePalette2)
pPalette->Common = (Size << 30) | X_D3DCOMMON_D3DCREATED | X_D3DCOMMON_TYPE_PALETTE | 1; // Set refcount to 1 pPalette->Common = (Size << 30) | X_D3DCOMMON_D3DCREATED | X_D3DCOMMON_TYPE_PALETTE | 1; // Set refcount to 1
pPalette->Data = (DWORD)new uint08[lk[Size]]; pPalette->Data = (DWORD)new uint08[lk[Size]];
pPalette->Lock = 0x8000BEEF; // emulated reference count for palettes pPalette->Lock = X_D3DRESOURCE_LOCK_PALETTE; // emulated reference count for palettes
// TODO: Should't we register the palette with a call to // TODO: Should't we register the palette with a call to
// EmuIDirect3DResource8_Register? So far, it doesn't look // EmuIDirect3DResource8_Register? So far, it doesn't look

4
src/CxbxKrnl/EmuD3D8Types.h
View File

@ -442,6 +442,7 @@ struct X_D3DResource
// special resource lock flags // special resource lock flags
#define X_D3DRESOURCE_LOCK_FLAG_NOSIZE 0xEFFFFFFF #define X_D3DRESOURCE_LOCK_FLAG_NOSIZE 0xEFFFFFFF
#define X_D3DRESOURCE_LOCK_PALETTE 0x8000BEEF
// Lock flags // Lock flags
#define X_D3DLOCK_NOFLUSH 0x00000010 // Xbox extension #define X_D3DLOCK_NOFLUSH 0x00000010 // Xbox extension
@ -449,6 +450,7 @@ struct X_D3DResource
#define X_D3DLOCK_TILED 0x00000040 // Xbox extension #define X_D3DLOCK_TILED 0x00000040 // Xbox extension
#define X_D3DLOCK_READONLY 0x00000080 #define X_D3DLOCK_READONLY 0x00000080
const int X_D3DMULTISAMPLE_NONE = 0x0011; const int X_D3DMULTISAMPLE_NONE = 0x0011;
const int X_D3DMULTISAMPLE_2_SAMPLES_MULTISAMPLE_LINEAR = 0x1021; const int X_D3DMULTISAMPLE_2_SAMPLES_MULTISAMPLE_LINEAR = 0x1021;
const int X_D3DMULTISAMPLE_2_SAMPLES_MULTISAMPLE_QUINCUNX = 0x1121; const int X_D3DMULTISAMPLE_2_SAMPLES_MULTISAMPLE_QUINCUNX = 0x1121;
@ -563,7 +565,7 @@ struct X_D3DCubeTexture : public X_D3DBaseTexture
struct X_D3DSurface : public X_D3DPixelContainer struct X_D3DSurface : public X_D3DPixelContainer
{ {
X_D3DBaseTexture *Parent;
}; };
struct X_D3DTILE struct X_D3DTILE