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

fix mis-calculated dword_count in D3DDevice_SetTexture() when pTexture<> nullptr. 

this fixs HeatShimmer sample.
This commit is contained in:
Jack Chen 2023-11-13 21:41:40 +08:00
parent acfcc3b55e
commit 4057e18f65
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -5779,10 +5779,12 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTexture)
else {
int dword_count = HLE_PushStart + 2;
DWORD* pPush_local = HLE_PushPrepare(X_D3DDevice_SetTexture, dword_count);
DWORD* pPush_local;// = HLE_PushPrepare(X_D3DDevice_SetTexture, dword_count);
pPush_local[2] = (DWORD)Stage;
if (pTexture) {
dword_count += sizeof(X_D3DSurface) / 4;
pPush_local = HLE_PushPrepare(X_D3DDevice_SetTexture, dword_count);
pPush_local[2] = (DWORD)Stage;
// we should better erase the pTexture if the key already existed in the map.
// but this would introduce a data confliction if the pgraph is accessing the same key which we're trying to erase.
// either a lock should be implemented here with g_TextureCache, or we simply keep the old key without updating it.
@ -5802,8 +5804,11 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTexture)
}
//g_TextureCache.insert(std::pair<UINT64, xbox::X_D3DSurface>(key, pTexture));
}
else
else {
pPush_local = HLE_PushPrepare(X_D3DDevice_SetTexture, dword_count);
pPush_local[2] = (DWORD)Stage;
pPush_local[3] = 0; // no pTexture
}
//*(UINT64*)& pPush_local[4] = pTexture->Data;
//pPush_local[5] = (DWORD)pTexture->Format;