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

D3D : More Direct3D 9 porting of vertex element conversion code (using more sensible types and code)

This commit is contained in:
PatrickvL 2018-05-24 14:15:49 +02:00
parent f235caca57
commit b54411774e
4 changed files with 235 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -8087,7 +8087,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderTarget)
DEBUG_D3DRESULT(hRet, "g_pD3DDevice->SetRenderTarget");
if (FAILED(hRet)) {
// If Direct3D 9 SetRenderTarget failed, skip setting depth stencil
return hRet;
return;
}
}
@ -9497,10 +9497,18 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetPixelShaderConstant_4)
if(g_BuildVersion <= 4361)
Register += 96;
#ifdef CXBX_USE_D3D9
HRESULT hRet = g_pD3DDevice->SetPixelShaderConstantF
#else
HRESULT hRet = g_pD3DDevice->SetPixelShaderConstant
#endif
(
Register,
#ifdef CXBX_USE_D3D9
(float*)pConstantData,
#else
pConstantData,
#endif
ConstantCount
);
//DEBUG_D3DRESULT(hRet, "g_pD3DDevice->SetPixelShaderConstant");

201
src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp
View File

@ -392,127 +392,168 @@ void XTL::CxbxVertexBufferConverter::ConvertStream
// assert(bNeedStreamCopy || "bNeedVertexPatching implies bNeedStreamCopy (but copies via conversions");
for (uint32 uiVertex = 0; uiVertex < uiVertexCount; uiVertex++) {
uint08 *pXboxVertex = &pXboxVertexData[uiVertex * uiXboxVertexStride];
FLOAT *pHostVertexAsFloat = (FLOAT*)(&pHostVertexData[uiVertex * uiHostVertexStride]);
uint08 *pHostVertex = &pHostVertexData[uiVertex * uiHostVertexStride];
for (UINT uiElement = 0; uiElement < pVertexShaderStreamInfo->NumberOfVertexElements; uiElement++) {
FLOAT *pXboxVertexAsFloat = (FLOAT*)pXboxVertex;
SHORT *pXboxVertexAsShort = (SHORT*)pXboxVertex;
BYTE *pXboxVertexAsByte = (BYTE*)pXboxVertex;
int XboxElementSizeInBytes = pVertexShaderStreamInfo->VertexElements[uiElement].HostByteSize;
FLOAT *pHostVertexAsFloat = (FLOAT*)pHostVertex;
SHORT *pHostVertexAsShort = (SHORT*)pHostVertex;
#if CXBX_USE_D3D9
BYTE *pHostVertexAsByte = (BYTE*)pHostVertex;
#endif
// Dxbx note : The following code handles only the D3DVSDT enums that need conversion;
// All other cases are catched by the memcpy in the default-block.
switch (pVertexShaderStreamInfo->VertexElements[uiElement].XboxType) {
case X_D3DVSDT_NORMSHORT1: { // 0x11:
// Test-cases : Halo - Combat Evolved
XboxElementSizeInBytes = 1 * sizeof(SHORT);
#if CXBX_USE_D3D9 // Make it SHORT2N
pHostVertexAsShort[0] = pXboxVertexAsShort[0];
pHostVertexAsShort[1] = 0;
#else // Make it FLOAT1
pHostVertexAsFloat[0] = ((FLOAT)pXboxVertexAsShort[0]) / 32767.0f;
//pHostVertexAsFloat[1] = 0.0f; // Would be needed for FLOAT2
#endif
break;
}
#if !CXBX_USE_D3D9 // No need for patching in D3D9
case X_D3DVSDT_NORMSHORT2: { // 0x21: // Make it FLOAT2
// Test-cases : Baldur's Gate: Dark Alliance 2, F1 2002, Gun, Halo - Combat Evolved, Scrapland
XboxElementSizeInBytes = 2 * sizeof(SHORT);
pHostVertexAsFloat[0] = ((FLOAT)pXboxVertexAsShort[0]) / 32767.0f;
pHostVertexAsFloat[1] = ((FLOAT)pXboxVertexAsShort[1]) / 32767.0f;
break;
}
#endif
case X_D3DVSDT_NORMSHORT3: { // 0x31:
// Test-cases : Cel Damage, Constantine, Destroy All Humans!
XboxElementSizeInBytes = 3 * sizeof(SHORT);
#if CXBX_USE_D3D9 // Make it SHORT4N
pHostVertexAsShort[0] = pXboxVertexAsShort[0];
pHostVertexAsShort[1] = pXboxVertexAsShort[1];
pHostVertexAsShort[2] = pXboxVertexAsShort[2];
pHostVertexAsShort[3] = 32767; // TODO : verify
#else // Make it FLOAT3
pHostVertexAsFloat[0] = ((FLOAT)pXboxVertexAsShort[0]) / 32767.0f;
pHostVertexAsFloat[1] = ((FLOAT)pXboxVertexAsShort[1]) / 32767.0f;
pHostVertexAsFloat[2] = ((FLOAT)pXboxVertexAsShort[2]) / 32767.0f;
#endif
break;
}
#if !CXBX_USE_D3D9 // No need for patching in D3D9
case X_D3DVSDT_NORMSHORT4: { // 0x41: // Make it FLOAT4
// Test-cases : Judge Dredd: Dredd vs Death, NHL Hitz 2002, Silent Hill 2, Sneakers, Tony Hawk Pro Skater 4
XboxElementSizeInBytes = 4 * sizeof(SHORT);
pHostVertexAsFloat[0] = ((FLOAT)pXboxVertexAsShort[0]) / 32767.0f;
pHostVertexAsFloat[1] = ((FLOAT)pXboxVertexAsShort[1]) / 32767.0f;
pHostVertexAsFloat[2] = ((FLOAT)pXboxVertexAsShort[2]) / 32767.0f;
pHostVertexAsFloat[3] = ((FLOAT)pXboxVertexAsShort[3]) / 32767.0f;
break;
}
#endif
case X_D3DVSDT_NORMPACKED3: { // 0x16: // Make it FLOAT3
// Hit by Dashboard
// Test-cases : Dashboard
XboxElementSizeInBytes = 1 * sizeof(int32);
int32 iPacked = ((int32 *)pXboxVertex)[0];
// Cxbx note : to make each component signed, two need to be shifted towards the sign-bit first :
pHostVertexAsFloat[0] = ((FLOAT)((iPacked << 21) >> 21)) / 1023.0f;
pHostVertexAsFloat[1] = ((FLOAT)((iPacked << 10) >> 21)) / 1023.0f;
pHostVertexAsFloat[2] = ((FLOAT)((iPacked ) >> 22)) / 511.0f;
pXboxVertex += 1 * sizeof(int32);
break;
}
case X_D3DVSDT_SHORT1: { // 0x15: // Make it SHORT2 and set the second short to 0
//memcpy(pHostVertexAsFloat, pXboxVertex, pVertexShaderStreamInfo->VertexElements[uiElement].HostByteSize);
((SHORT *)pHostVertexAsFloat)[0] = ((SHORT*)pXboxVertex)[0];
((SHORT *)pHostVertexAsFloat)[1] = 0x00;
pXboxVertex += 1 * sizeof(SHORT);
XboxElementSizeInBytes = 1 * sizeof(SHORT);
//memcpy(pHostVertexAsFloat, pXboxVertex, XboxElementSizeInBytes);
pHostVertexAsShort[0] = pXboxVertexAsShort[0];
pHostVertexAsShort[1] = 0x00;
break;
}
case X_D3DVSDT_SHORT3: { // 0x35: // Make it a SHORT4 and set the fourth short to 1
// Hit by Turok
//memcpy(pHostVertexAsFloat, pXboxVertex, pVertexShaderStreamInfo->VertexElements[uiElement].HostByteSize);
((SHORT *)pHostVertexAsFloat)[0] = ((SHORT*)pXboxVertex)[0];
((SHORT *)pHostVertexAsFloat)[1] = ((SHORT*)pXboxVertex)[1];
((SHORT *)pHostVertexAsFloat)[2] = ((SHORT*)pXboxVertex)[2];
((SHORT *)pHostVertexAsFloat)[3] = 0x01; // Turok verified (character disappears when this is 32767)
pXboxVertex += 3 * sizeof(SHORT);
// Test-cases : Turok
XboxElementSizeInBytes = 3 * sizeof(SHORT);
//memcpy(pHostVertexAsFloat, pXboxVertex, XboxElementSizeInBytes);
pHostVertexAsShort[0] = pXboxVertexAsShort[0];
pHostVertexAsShort[1] = pXboxVertexAsShort[1];
pHostVertexAsShort[2] = pXboxVertexAsShort[2];
pHostVertexAsShort[3] = 0x01; // Turok verified (character disappears when this is 32767)
break;
}
case X_D3DVSDT_PBYTE1: { // 0x14: // Make it FLOAT1
pHostVertexAsFloat[0] = ((FLOAT)((BYTE*)pXboxVertex)[0]) / 255.0f;
pXboxVertex += 1 * sizeof(BYTE);
case X_D3DVSDT_PBYTE1: { // 0x14:
XboxElementSizeInBytes = 1 * sizeof(BYTE);
#if CXBX_USE_D3D9 // Make it UBYTE4N
pHostVertexAsByte[0] = pXboxVertexAsByte[0];
pHostVertexAsByte[1] = 0;
pHostVertexAsByte[2] = 0;
pHostVertexAsByte[3] = 255; // TODO : Verify
#else // Make it FLOAT1
pHostVertexAsFloat[0] = ((FLOAT)pXboxVertexAsByte[0]) / 255.0f;
#endif
break;
}
case X_D3DVSDT_PBYTE2: { // 0x24: // Make it FLOAT2
pHostVertexAsFloat[0] = ((FLOAT)((BYTE*)pXboxVertex)[0]) / 255.0f;
pHostVertexAsFloat[1] = ((FLOAT)((BYTE*)pXboxVertex)[1]) / 255.0f;
pXboxVertex += 2 * sizeof(BYTE);
case X_D3DVSDT_PBYTE2: { // 0x24:
XboxElementSizeInBytes = 2 * sizeof(BYTE);
#if CXBX_USE_D3D9 // Make it UBYTE4N
pHostVertexAsByte[0] = pXboxVertexAsByte[0];
pHostVertexAsByte[1] = pXboxVertexAsByte[1];
pHostVertexAsByte[2] = 0;
pHostVertexAsByte[3] = 255; // TODO : Verify
#else // Make it FLOAT2
pHostVertexAsFloat[0] = ((FLOAT)pXboxVertexAsByte[0]) / 255.0f;
pHostVertexAsFloat[1] = ((FLOAT)pXboxVertexAsByte[1]) / 255.0f;
#endif
break;
}
case X_D3DVSDT_PBYTE3: { // 0x34: // Make it FLOAT3
// Hit by Turok
pHostVertexAsFloat[0] = ((FLOAT)((BYTE*)pXboxVertex)[0]) / 255.0f;
pHostVertexAsFloat[1] = ((FLOAT)((BYTE*)pXboxVertex)[1]) / 255.0f;
pHostVertexAsFloat[2] = ((FLOAT)((BYTE*)pXboxVertex)[2]) / 255.0f;
pXboxVertex += 3 * sizeof(BYTE);
case X_D3DVSDT_PBYTE3: { // 0x34:
// Test-cases : Turok
XboxElementSizeInBytes = 3 * sizeof(BYTE);
#if CXBX_USE_D3D9 // Make it UBYTE4N
pHostVertexAsByte[0] = pXboxVertexAsByte[0];
pHostVertexAsByte[1] = pXboxVertexAsByte[1];
pHostVertexAsByte[2] = pXboxVertexAsByte[2];
pHostVertexAsByte[3] = 255; // TODO : Verify
#else // Make it FLOAT3
pHostVertexAsFloat[0] = ((FLOAT)pXboxVertexAsByte[0]) / 255.0f;
pHostVertexAsFloat[1] = ((FLOAT)pXboxVertexAsByte[1]) / 255.0f;
pHostVertexAsFloat[2] = ((FLOAT)pXboxVertexAsByte[2]) / 255.0f;
#endif
break;
}
#if !CXBX_USE_D3D9 // No need for patching in D3D9
case X_D3DVSDT_PBYTE4: { // 0x44: // Make it FLOAT4
// Hit by Jet Set Radio Future
pHostVertexAsFloat[0] = ((FLOAT)((BYTE*)pXboxVertex)[0]) / 255.0f;
pHostVertexAsFloat[1] = ((FLOAT)((BYTE*)pXboxVertex)[1]) / 255.0f;
pHostVertexAsFloat[2] = ((FLOAT)((BYTE*)pXboxVertex)[2]) / 255.0f;
pHostVertexAsFloat[3] = ((FLOAT)((BYTE*)pXboxVertex)[3]) / 255.0f;
pXboxVertex += 4 * sizeof(BYTE);
break;
}
case X_D3DVSDT_NORMSHORT1: { // 0x11: // Make it FLOAT1
// Test-cases : Halo - Combat Evolved
pHostVertexAsFloat[0] = ((FLOAT)((SHORT*)pXboxVertex)[0]) / 32767.0f;
//pHostVertexAsFloat[1] = 0.0f; // Would be needed for FLOAT2
pXboxVertex += 1 * sizeof(SHORT);
break;
}
#if !DXBX_USE_D3D9 // No need for patching in D3D9
case X_D3DVSDT_NORMSHORT2: { // 0x21: // Make it FLOAT2
// Test-cases : Baldur's Gate: Dark Alliance 2, F1 2002, Gun, Halo - Combat Evolved, Scrapland
pHostVertexAsFloat[0] = ((FLOAT)((SHORT*)pXboxVertex)[0]) / 32767.0f;
pHostVertexAsFloat[1] = ((FLOAT)((SHORT*)pXboxVertex)[1]) / 32767.0f;
pXboxVertex += 2 * sizeof(SHORT);
break;
}
#endif
case X_D3DVSDT_NORMSHORT3: { // 0x31: // Make it FLOAT3
// Test-cases : Cel Damage, Constantine, Destroy All Humans!
pHostVertexAsFloat[0] = ((FLOAT)((SHORT*)pXboxVertex)[0]) / 32767.0f;
pHostVertexAsFloat[1] = ((FLOAT)((SHORT*)pXboxVertex)[1]) / 32767.0f;
pHostVertexAsFloat[2] = ((FLOAT)((SHORT*)pXboxVertex)[2]) / 32767.0f;
pXboxVertex += 3 * sizeof(SHORT);
break;
}
#if !DXBX_USE_D3D9 // No need for patching in D3D9
case X_D3DVSDT_NORMSHORT4: { // 0x41: // Make it FLOAT4
LOG_TEST_CASE("X_D3DVSDT_NORMSHORT4"); // UNTESTED - Need test-case!
pHostVertexAsFloat[0] = ((FLOAT)((SHORT*)pXboxVertex)[0]) / 32767.0f;
pHostVertexAsFloat[1] = ((FLOAT)((SHORT*)pXboxVertex)[1]) / 32767.0f;
pHostVertexAsFloat[2] = ((FLOAT)((SHORT*)pXboxVertex)[2]) / 32767.0f;
pHostVertexAsFloat[3] = ((FLOAT)((SHORT*)pXboxVertex)[3]) / 32767.0f;
pXboxVertex += 4 * sizeof(SHORT);
XboxElementSizeInBytes = 4 * sizeof(BYTE);
pHostVertexAsFloat[0] = ((FLOAT)pXboxVertexAsByte[0]) / 255.0f;
pHostVertexAsFloat[1] = ((FLOAT)pXboxVertexAsByte[1]) / 255.0f;
pHostVertexAsFloat[2] = ((FLOAT)pXboxVertexAsByte[2]) / 255.0f;
pHostVertexAsFloat[3] = ((FLOAT)pXboxVertexAsByte[3]) / 255.0f;
break;
}
#endif
case X_D3DVSDT_FLOAT2H: { // 0x72: // Make it FLOAT4 and set the third float to 0.0
pHostVertexAsFloat[0] = ((FLOAT*)pXboxVertex)[0];
pHostVertexAsFloat[1] = ((FLOAT*)pXboxVertex)[1];
XboxElementSizeInBytes = 3 * sizeof(FLOAT);
pHostVertexAsFloat[0] = pXboxVertexAsFloat[0];
pHostVertexAsFloat[1] = pXboxVertexAsFloat[1];
pHostVertexAsFloat[2] = 0.0f;
pHostVertexAsFloat[3] = ((FLOAT*)pXboxVertex)[2];
pXboxVertex += 3 * sizeof(FLOAT);
pHostVertexAsFloat[3] = pXboxVertexAsFloat[2];
break;
}
/*TODO
case X_D3DVSDT_NONE: { // 0x02:
printf("D3DVSDT_NONE / xbox ext. nsp /");
dwNewDataType = 0xFF;
case X_D3DVSDT_NONE: { // 0x02: // Skip it
LOG_TEST_CASE("X_D3DVSDT_NONE");
break;
}
*/
default: {
// Generic 'conversion' - just make a copy :
memcpy(pHostVertexAsFloat, pXboxVertex, pVertexShaderStreamInfo->VertexElements[uiElement].HostByteSize);
pXboxVertex += pVertexShaderStreamInfo->VertexElements[uiElement].HostByteSize;
memcpy(pHostVertex, pXboxVertex, XboxElementSizeInBytes);
break;
}
} // switch
// Increment the new pointer :
pHostVertexAsFloat = (FLOAT*)((uintptr_t)pHostVertexAsFloat + pVertexShaderStreamInfo->VertexElements[uiElement].HostByteSize);
// Increment the Xbox pointer :
pXboxVertex += XboxElementSizeInBytes;
// Increment the host pointer :
pHostVertex += pVertexShaderStreamInfo->VertexElements[uiElement].HostByteSize;
} // for NumberOfVertexElements
} // for uiVertexCount
}

154
src/CxbxKrnl/EmuD3D8/VertexShader.cpp
View File

@ -1800,7 +1800,7 @@ static inline DWORD VshGetVertexStream(DWORD Token)
static void VshConvertToken_NOP(
DWORD *pToken,
D3DVERTEXELEMENT *pRecompiled
XTL::D3DVERTEXELEMENT *pRecompiled
)
{
// D3DVSD_NOP
@ -1813,7 +1813,7 @@ static void VshConvertToken_NOP(
static DWORD VshConvertToken_CONSTMEM(
DWORD *pToken,
D3DVERTEXELEMENT *pRecompiled
XTL::D3DVERTEXELEMENT *pRecompiled
)
{
// D3DVSD_CONST
@ -1835,7 +1835,7 @@ static DWORD VshConvertToken_CONSTMEM(
static void VshConvertToken_TESSELATOR(
DWORD *pToken,
D3DVERTEXELEMENT *pRecompiled,
XTL::D3DVERTEXELEMENT *pRecompiled,
boolean IsFixedFunction
)
{
@ -1899,7 +1899,7 @@ static void VshEndPreviousStreamPatch(CxbxVertexShaderPatch *pPatchData)
static void VshConvertToken_STREAM(
DWORD *pToken,
D3DVERTEXELEMENT *pRecompiled,
XTL::D3DVERTEXELEMENT *pRecompiled,
CxbxVertexShaderPatch *pPatchData
)
{
@ -1932,7 +1932,7 @@ static void VshConvertToken_STREAM(
static void VshConvertToken_STREAMDATA_SKIP(
DWORD *pToken,
D3DVERTEXELEMENT *pRecompiled
XTL::D3DVERTEXELEMENT *pRecompiled
)
{
using namespace XTL;
@ -1944,7 +1944,7 @@ static void VshConvertToken_STREAMDATA_SKIP(
static void VshConvertToken_STREAMDATA_SKIPBYTES(
DWORD *pToken,
D3DVERTEXELEMENT *pRecompiled
XTL::D3DVERTEXELEMENT *pRecompiled
)
{
using namespace XTL;
@ -1960,13 +1960,24 @@ static void VshConvertToken_STREAMDATA_SKIPBYTES(
static void VshConvertToken_STREAMDATA_REG(
DWORD *pToken,
D3DVERTEXELEMENT *pRecompiled,
XTL::D3DVERTEXELEMENT *pRecompiled,
boolean IsFixedFunction,
CxbxVertexShaderPatch *pPatchData
)
{
using namespace XTL;
#if !CXBX_USE_D3D9 // For simpler support for both Direct3D 8 and 9, use these '9' constants in below '8' code paths too:
#define D3DDECLTYPE_FLOAT1 D3DVSDT_FLOAT1
#define D3DDECLTYPE_FLOAT2 D3DVSDT_FLOAT2
#define D3DDECLTYPE_FLOAT3 D3DVSDT_FLOAT3
#define D3DDECLTYPE_FLOAT4 D3DVSDT_FLOAT4
#define D3DDECLTYPE_D3DCOLOR D3DVSDT_D3DCOLOR
#define D3DDECLTYPE_SHORT2 D3DVSDT_SHORT2
#define D3DDECLTYPE_SHORT4 D3DVSDT_SHORT4
#define D3DDECLTYPE_UNUSED 0xFF
#endif
XTL::DWORD VertexRegister = VshGetVertexRegister(*pToken);
XTL::DWORD HostVertexRegister;
XTL::BOOL NeedPatching = FALSE;
@ -1983,118 +1994,161 @@ static void VshConvertToken_STREAMDATA_REG(
{
case X_D3DVSDT_FLOAT1: // 0x12:
DbgVshPrintf("D3DVSDT_FLOAT1");
HostVertexElementDataType = D3DVSDT_FLOAT1;
HostVertexElementDataType = D3DDECLTYPE_FLOAT1;
HostVertexElementByteSize = 1*sizeof(FLOAT);
break;
case X_D3DVSDT_FLOAT2: // 0x22:
DbgVshPrintf("D3DVSDT_FLOAT2");
HostVertexElementDataType = D3DVSDT_FLOAT2;
HostVertexElementDataType = D3DDECLTYPE_FLOAT2;
HostVertexElementByteSize = 2*sizeof(FLOAT);
break;
case X_D3DVSDT_FLOAT3: // 0x32:
DbgVshPrintf("D3DVSDT_FLOAT3");
HostVertexElementDataType = D3DVSDT_FLOAT3;
HostVertexElementDataType = D3DDECLTYPE_FLOAT3;
HostVertexElementByteSize = 3*sizeof(FLOAT);
break;
case X_D3DVSDT_FLOAT4: // 0x42:
DbgVshPrintf("D3DVSDT_FLOAT4");
HostVertexElementDataType = D3DVSDT_FLOAT4;
HostVertexElementDataType = D3DDECLTYPE_FLOAT4;
HostVertexElementByteSize = 4*sizeof(FLOAT);
break;
case X_D3DVSDT_D3DCOLOR: // 0x40:
DbgVshPrintf("D3DVSDT_D3DCOLOR");
HostVertexElementDataType = D3DVSDT_D3DCOLOR;
HostVertexElementByteSize = sizeof(D3DCOLOR);
HostVertexElementDataType = D3DDECLTYPE_D3DCOLOR;
HostVertexElementByteSize = 1*sizeof(D3DCOLOR);
break;
case X_D3DVSDT_SHORT2: // 0x25:
DbgVshPrintf("D3DVSDT_SHORT2");
HostVertexElementDataType = D3DVSDT_SHORT2;
HostVertexElementDataType = D3DDECLTYPE_SHORT2;
HostVertexElementByteSize = 2*sizeof(XTL::SHORT);
break;
case X_D3DVSDT_SHORT4: // 0x45:
DbgVshPrintf("D3DVSDT_SHORT4");
HostVertexElementDataType = D3DVSDT_SHORT4;
HostVertexElementDataType = D3DDECLTYPE_SHORT4;
HostVertexElementByteSize = 4*sizeof(XTL::SHORT);
break;
case X_D3DVSDT_NORMSHORT1: // 0x11:
DbgVshPrintf("D3DVSDT_NORMSHORT1 /* xbox ext. */");
HostVertexElementDataType = D3DVSDT_FLOAT1; // TODO -oDxbx : Is it better to use D3DVSDT_NORMSHORT2 in Direct3D9 ?
HostVertexElementByteSize = sizeof(FLOAT);
#if CXBX_USE_D3D9
HostVertexElementDataType = D3DDECLTYPE_SHORT2N;
HostVertexElementByteSize = 2*sizeof(SHORT);
#else
HostVertexElementDataType = D3DDECLTYPE_FLOAT1;
HostVertexElementByteSize = 1*sizeof(FLOAT);
#endif
NeedPatching = TRUE;
break;
case X_D3DVSDT_NORMSHORT2: // 0x21:
DbgVshPrintf("D3DVSDT_NORMSHORT2 /* xbox ext. */");
HostVertexElementDataType = D3DVSDT_FLOAT2;
#if CXBX_USE_D3D9
DbgVshPrintf("D3DVSDT_NORMSHORT2");
HostVertexElementDataType = D3DDECLTYPE_SHORT2N;
HostVertexElementByteSize = 2*sizeof(SHORT);
// No need for patching in D3D9
#else
DbgVshPrintf("D3DVSDT_NORMSHORT2 /* xbox ext. */");
HostVertexElementDataType = D3DDECLTYPE_FLOAT2;
HostVertexElementByteSize = 2*sizeof(FLOAT);
NeedPatching = TRUE;
break;
#endif
break;
case X_D3DVSDT_NORMSHORT3: // 0x31:
DbgVshPrintf("D3DVSDT_NORMSHORT3 /* xbox ext. nsp */");
HostVertexElementDataType = D3DVSDT_FLOAT3; // TODO -oDxbx : Is it better to use D3DVSDT_NORMSHORT4 in Direct3D9 ?
DbgVshPrintf("D3DVSDT_NORMSHORT3 /* xbox ext. */");
#if CXBX_USE_D3D9
HostVertexElementDataType = D3DDECLTYPE_SHORT4N;
HostVertexElementByteSize = 4*sizeof(SHORT);
#else
HostVertexElementDataType = D3DDECLTYPE_FLOAT3;
HostVertexElementByteSize = 3*sizeof(FLOAT);
#endif
NeedPatching = TRUE;
break;
case X_D3DVSDT_NORMSHORT4: // 0x41:
DbgVshPrintf("D3DVSDT_NORMSHORT4 /* xbox ext. */");
HostVertexElementDataType = D3DVSDT_FLOAT4;
#if CXBX_USE_D3D9
DbgVshPrintf("D3DVSDT_NORMSHORT4");
HostVertexElementDataType = D3DDECLTYPE_SHORT4N;
HostVertexElementByteSize = 4*sizeof(SHORT);
// No need for patching in D3D9
#else
DbgVshPrintf("D3DVSDT_NORMSHORT4 /* xbox ext. */");
HostVertexElementDataType = D3DDECLTYPE_FLOAT4;
HostVertexElementByteSize = 4*sizeof(FLOAT);
NeedPatching = TRUE;
#endif
break;
case X_D3DVSDT_NORMPACKED3: // 0x16:
DbgVshPrintf("D3DVSDT_NORMPACKED3 /* xbox ext. nsp */");
HostVertexElementDataType = D3DVSDT_FLOAT3;
DbgVshPrintf("D3DVSDT_NORMPACKED3 /* xbox ext. */");
HostVertexElementDataType = D3DDECLTYPE_FLOAT3;
HostVertexElementByteSize = 3*sizeof(FLOAT);
NeedPatching = TRUE;
break;
case X_D3DVSDT_SHORT1: // 0x15:
DbgVshPrintf("D3DVSDT_SHORT1 /* xbox ext. nsp */");
HostVertexElementDataType = D3DVSDT_SHORT2;
DbgVshPrintf("D3DVSDT_SHORT1 /* xbox ext. */");
HostVertexElementDataType = D3DDECLTYPE_SHORT2;
HostVertexElementByteSize = 2*sizeof(XTL::SHORT);
NeedPatching = TRUE;
break;
case X_D3DVSDT_SHORT3: // 0x35:
DbgVshPrintf("D3DVSDT_SHORT3 /* xbox ext. nsp */");
HostVertexElementDataType = D3DVSDT_SHORT4;
DbgVshPrintf("D3DVSDT_SHORT3 /* xbox ext. */");
HostVertexElementDataType = D3DDECLTYPE_SHORT4;
HostVertexElementByteSize = 4*sizeof(XTL::SHORT);
NeedPatching = TRUE;
break;
case X_D3DVSDT_PBYTE1: // 0x14:
DbgVshPrintf("D3DVSDT_PBYTE1 /* xbox ext. nsp */");
HostVertexElementDataType = D3DVSDT_FLOAT1; // TODO -oDxbx : Is it better to use D3DVSDT_NORMSHORT2 in Direct3D9 ?
DbgVshPrintf("D3DVSDT_PBYTE1 /* xbox ext. */");
#if CXBX_USE_D3D9
HostVertexElementDataType = D3DDECLTYPE_UBYTE4N;
HostVertexElementByteSize = 4*sizeof(BYTE);
#else
HostVertexElementDataType = D3DDECLTYPE_FLOAT1;
HostVertexElementByteSize = 1*sizeof(FLOAT);
NeedPatching = TRUE;
#endif
NeedPatching = TRUE;
break;
case X_D3DVSDT_PBYTE2: // 0x24:
DbgVshPrintf("D3DVSDT_PBYTE2 /* xbox ext. nsp */");
HostVertexElementDataType = D3DVSDT_FLOAT2; // TODO -oDxbx : Is it better to use D3DVSDT_NORMSHORT2 in Direct3D9 ?
DbgVshPrintf("D3DVSDT_PBYTE2 /* xbox ext. */");
#if CXBX_USE_D3D9
HostVertexElementDataType = D3DDECLTYPE_UBYTE4N;
HostVertexElementByteSize = 4*sizeof(BYTE);
#else
HostVertexElementDataType = D3DDECLTYPE_FLOAT2;
HostVertexElementByteSize = 2*sizeof(FLOAT);
#endif
NeedPatching = TRUE;
break;
case X_D3DVSDT_PBYTE3: // 0x34:
DbgVshPrintf("D3DVSDT_PBYTE3 /* xbox ext. nsp */");
HostVertexElementDataType = D3DVSDT_FLOAT3; // TODO -oDxbx : Is it better to use D3DVSDT_NORMSHORT4 in Direct3D9 ?
DbgVshPrintf("D3DVSDT_PBYTE3 /* xbox ext. */");
#if CXBX_USE_D3D9
HostVertexElementDataType = D3DDECLTYPE_UBYTE4N;
HostVertexElementByteSize = 4*sizeof(BYTE);
#else
HostVertexElementDataType = D3DDECLTYPE_FLOAT3;
HostVertexElementByteSize = 3*sizeof(FLOAT);
#endif
NeedPatching = TRUE;
break;
case X_D3DVSDT_PBYTE4: // 0x44: // Hit by Panzer
#if CXBX_USE_D3D9
DbgVshPrintf("D3DVSDT_PBYTE4");
HostVertexElementDataType = D3DDECLTYPE_UBYTE4N;
HostVertexElementByteSize = 4*sizeof(BYTE);
// No need for patching in D3D9
#else
DbgVshPrintf("D3DVSDT_PBYTE4 /* xbox ext. */");
HostVertexElementDataType = D3DVSDT_FLOAT4; // TODO -oDxbx : Is it better to use D3DVSDT_NORMSHORT4 or D3DDECLTYPE_UBYTE4N (if in caps) in Direct3D9 ?
HostVertexElementDataType = D3DDECLTYPE_FLOAT4;
HostVertexElementByteSize = 4*sizeof(FLOAT);
NeedPatching = TRUE;
#endif
break;
case X_D3DVSDT_FLOAT2H: // 0x72:
DbgVshPrintf("D3DVSDT_FLOAT2H /* xbox ext. */");
HostVertexElementDataType = D3DVSDT_FLOAT4;
HostVertexElementDataType = D3DDECLTYPE_FLOAT4;
HostVertexElementByteSize = 4*sizeof(FLOAT);
NeedPatching = TRUE;
break;
case X_D3DVSDT_NONE: // 0x02:
DbgVshPrintf("D3DVSDT_NONE /* xbox ext. nsp */");
#if CXBX_USE_D3D9
HostVertexElementDataType = D3DVSDT_NONE;
#endif
// TODO -oDxbx: Use D3DVSD_NOP ?
HostVertexElementDataType = 0xFF;
DbgVshPrintf("D3DVSDT_NONE /* xbox ext. */");
HostVertexElementDataType = D3DDECLTYPE_UNUSED;
NeedPatching = TRUE;
break;
default:
DbgVshPrintf("Unknown data type for D3DVSD_REG: 0x%02X\n", XboxVertexElementDataType);
@ -2114,7 +2168,7 @@ static void VshConvertToken_STREAMDATA_REG(
DbgVshPrintf("),\n");
if(HostVertexElementDataType == 0xFF)
if(HostVertexElementDataType == D3DDECLTYPE_UNUSED)
{
EmuWarning("/* WARNING: Fatal type mismatch, no fitting type! */");
}
@ -2122,7 +2176,7 @@ static void VshConvertToken_STREAMDATA_REG(
static void VshConvertToken_STREAMDATA(
DWORD *pToken,
D3DVERTEXELEMENT *pRecompiled,
XTL::D3DVERTEXELEMENT *pRecompiled,
boolean IsFixedFunction,
CxbxVertexShaderPatch *pPatchData
)
@ -2145,7 +2199,7 @@ static void VshConvertToken_STREAMDATA(
static DWORD VshRecompileToken(
DWORD *pToken,
D3DVERTEXELEMENT *&pRecompiled,
XTL::D3DVERTEXELEMENT *&pRecompiled,
boolean IsFixedFunction,
CxbxVertexShaderPatch *pPatchData
)
@ -2190,7 +2244,7 @@ static DWORD VshRecompileToken(
DWORD XTL::EmuRecompileVshDeclaration
(
DWORD *pDeclaration,
D3DVERTEXELEMENT **ppRecompiledDeclaration,
D3DVERTEXELEMENT **ppRecompiledDeclaration,
DWORD *pDeclarationSize,
boolean IsFixedFunction,
CxbxVertexShaderInfo *pVertexShaderInfo
@ -2442,4 +2496,4 @@ XTL::CxbxVertexShaderInfo *GetCxbxVertexShaderInfo(DWORD Handle)
}
}
return NULL;
}
}

2
src/CxbxKrnl/EmuD3D8/VertexShader.h
View File

@ -53,7 +53,7 @@ VSH_SHADER_HEADER;
extern DWORD EmuRecompileVshDeclaration
(
DWORD *pDeclaration,
DWORD **ppRecompiledDeclaration,
D3DVERTEXELEMENT **ppRecompiledDeclaration,
DWORD *pDeclarationSize,
boolean IsFixedFunction,
XTL::CxbxVertexShaderInfo *pVertexShaderInfo