Emulation/cxbx-shogun
1
0
Fork 0
mirror of https://github.com/Echelon9/cxbx-shogun.git synced 2024-06-12 17:37:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve documentation of D3DPOOL_DEFAULT

Browse source
This commit is contained in:
Echelon9 2014-05-25 16:13:47 +10:00
parent 96c26e5437
commit e578ade2f9
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/CxbxKrnl/EmuD3D8.cpp
View file

@ -3120,7 +3120,7 @@ XTL::X_D3DResource * WINAPI XTL::EmuIDirect3DDevice8_CreateTexture2
case 5: /*D3DRTYPE_CUBETEXTURE*/
//DbgPrintf( "D3DDevice_CreateTexture2: Width = 0x%X, Height = 0x%X\n", Width, Height );
//CxbxKrnlCleanup("Cube textures temporarily not supported!");
EmuIDirect3DDevice8_CreateCubeTexture(Width, Levels, Usage, Format, D3DPOOL_DEFAULT, (X_D3DCubeTexture**) &pTexture);
EmuIDirect3DDevice8_CreateCubeTexture(Width, Levels, Usage, Format, D3DPOOL_MANAGED, (X_D3DCubeTexture**) &pTexture);
break;
default:
CxbxKrnlCleanup("D3DResource = %d is not supported!", D3DResource);
@ -3214,7 +3214,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateTexture
// if(Usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL))
if(Usage & (D3DUSAGE_RENDERTARGET))
{
PCPool = D3DPOOL_DEFAULT;
}
hRet = g_pD3DDevice8->CreateTexture
(
@ -3232,6 +3234,15 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateTexture
{
D3DLOCKED_RECT LockedRect;
/**
* Note: If CreateTexture() called with D3DPOOL_DEFAULT then unable to Lock.
* It will cause an Error with the DirectX Debug runtime.
*
* This is most commonly seen with
* D3DUSAGE_RENDERTARGET or
* D3DUSAGE_DEPTHSTENCIL
* that can only be used with D3DPOOL_DEFAULT per MSDN.
*/
(*ppTexture)->EmuTexture8->LockRect(0, &LockedRect, NULL, NULL);
(*ppTexture)->Data = (DWORD)LockedRect.pBits;