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

SetPalette now supports all 4 stages. Also constantified TEXTURE_STAGES

This commit is contained in:
PatrickvL 2017-04-22 18:27:19 +01:00
parent e9dff8cfcb
commit 0d47476dcc
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -141,9 +141,9 @@ static DWORD g_dwVertexShaderUsage = 0;
static DWORD g_VertexShaderSlots[136];
// cached palette pointer
static PVOID g_pCurrentPalette = nullptr;
static PVOID g_pCurrentPalette[TEXTURE_STAGES] = { nullptr, nullptr, nullptr, nullptr };
// cached palette size
static DWORD g_dwCurrentPaletteSize = -1;
static DWORD g_dwCurrentPaletteSize[TEXTURE_STAGES] = { -1, -1, -1, -1 };
static XTL::X_VERTEXSHADERCONSTANTMODE g_VertexShaderConstantMode = X_VSCM_192;
@ -151,7 +151,7 @@ static XTL::X_VERTEXSHADERCONSTANTMODE g_VertexShaderConstantMode = X_VSCM_192;
XTL::X_D3DTILE XTL::EmuD3DTileCache[0x08] = {0};
// cached active texture
XTL::X_D3DPixelContainer *XTL::EmuD3DActiveTexture[4] = {0,0,0,0};
XTL::X_D3DPixelContainer *XTL::EmuD3DActiveTexture[TEXTURE_STAGES] = {0,0,0,0};
// information passed to the create device proxy thread
struct EmuD3D8CreateDeviceProxyData
@ -1416,7 +1416,7 @@ static void EmuAdjustPower2(UINT *dwWidth, UINT *dwHeight)
// Derived from EmuUnswizzleActiveTexture
static void EmuUnswizzleTextureStages()
{
for( int i = 0; i < 4; i++ )
for( int i = 0; i < TEXTURE_STAGES; i++ )
{
// for current usages, we're always on stage 0
XTL::X_D3DPixelContainer *pPixelContainer = XTL::EmuD3DActiveTexture[i];
@ -3785,9 +3785,9 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetTexture)
}
/*
static IDirect3DTexture8 *pDummyTexture[4] = {0, 0, 0, 0};
static IDirect3DTexture8 *pDummyTexture[TEXTURE_STAGES] = {nullptr, nullptr, nullptr, nullptr};
if(pDummyTexture[Stage] == 0)
if(pDummyTexture[Stage] == nullptr)
{
if(Stage == 0)
{
@ -3839,10 +3839,10 @@ VOID __fastcall XTL::EMUPATCH(D3DDevice_SwitchTexture)
");\n",
Method, Data, Format);
DWORD StageLookup[] = { 0x00081b00, 0x00081b40, 0x00081b80, 0x00081bc0 };
DWORD StageLookup[TEXTURE_STAGES] = { 0x00081b00, 0x00081b40, 0x00081b80, 0x00081bc0 };
DWORD Stage = -1;
for(int v=0;v<4;v++)
for(int v=0;v<TEXTURE_STAGES;v++)
{
if(StageLookup[v] == Method)
{
@ -4536,6 +4536,8 @@ HRESULT WINAPI XTL::EMUPATCH(D3DResource_Register)
HRESULT hRet = S_OK;
const int TextureStage = 0;
X_D3DResource *pResource = pThis;
DWORD dwCommonType = GetXboxResourceType(pResource);
@ -5066,7 +5068,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DResource_Register)
BYTE *pPixelData = (BYTE*)LockedRect.pBits;
DWORD dwDataSize = dwMipWidth*dwMipHeight;
DWORD* pExpandedTexture = (DWORD*)malloc(dwDataSize * sizeof(DWORD));
DWORD* pTexturePalette = (DWORD*)g_pCurrentPalette; // For D3DFMT_P8
DWORD* pTexturePalette = (DWORD*)g_pCurrentPalette[TextureStage]; // For D3DFMT_P8
const ComponentEncodingInfo *encoding = EmuXBFormatComponentEncodingInfo(X_Format);
//__asm int 3;
@ -5209,8 +5211,8 @@ HRESULT WINAPI XTL::EMUPATCH(D3DResource_Register)
pPalette->Lock = X_D3DRESOURCE_LOCK_FLAG_NOSIZE;
}
g_pCurrentPalette = pBase;
g_dwCurrentPaletteSize = dwSize;
g_pCurrentPalette[TextureStage] = pBase;
g_dwCurrentPaletteSize[TextureStage] = dwSize;
pResource->Data = (DWORD)pBase;
}
@ -8479,22 +8481,19 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetPalette)
");\n",
Stage, pPalette);
// g_pD3DDevice8->SetPaletteEntries(0, (PALETTEENTRY*)pPalette->Data);
// g_pD3DDevice9->SetPaletteEntries(Stage?, (PALETTEENTRY*)pPalette->Data);
// g_pD3DDevice9->SetCurrentTexturePalette(Stage, Stage);
// Cache palette data and size
if( pPalette )
if (Stage < TEXTURE_STAGES)
{
if( pPalette->Data )
{
g_pCurrentPalette = (LPVOID) pPalette->Data;
g_dwCurrentPaletteSize = g_MemoryManager.QueryAllocationSize((LPVOID)pPalette->Data);
// Cache palette data and size
g_pCurrentPalette[Stage] = GetDataFromXboxResource(pPalette);
if (g_pCurrentPalette[Stage] != NULL)
g_dwCurrentPaletteSize[Stage] = g_MemoryManager.QueryAllocationSize((LPVOID)g_pCurrentPalette);
else {
g_dwCurrentPaletteSize[Stage] = 0;
}
}
EmuWarning("Not setting palette");
return D3D_OK;
}

2
src/CxbxKrnl/EmuD3D8.h
View File

@ -67,7 +67,7 @@ extern VOID EmuD3DCleanup();
extern X_D3DTILE EmuD3DTileCache[0x08];
// EmuD3DActiveTexture
extern X_D3DPixelContainer *EmuD3DActiveTexture[4];
extern X_D3DPixelContainer *EmuD3DActiveTexture[TEXTURE_STAGES];
// ******************************************************************
// * patch: Direct3D_CreateDevice

4
src/CxbxKrnl/EmuD3D8Types.h
View File

@ -241,6 +241,8 @@ X_D3DRESOURCETYPE;
#define X_D3DTEXTURE_PITCH_ALIGNMENT X_D3D_RENDER_MEMORY_ALIGNMENT
#define X_D3DTEXTURE_PITCH_MIN X_D3DTEXTURE_PITCH_ALIGNMENT
#define TEXTURE_STAGES 4 // X_D3DTS_STAGECOUNT
typedef enum _X_D3DSET_DEPTH_CLIP_PLANES_FLAGS
{
X_D3DSDCP_SET_VERTEXPROGRAM_PLANES = 1,
@ -373,7 +375,7 @@ typedef struct _PixelShader_
DWORD dwStatus;
X_D3DPIXELSHADERDEF PSDef;
DWORD dwStageMap[4];
DWORD dwStageMap[TEXTURE_STAGES];
} PIXEL_SHADER;