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

Merge pull request #1642 from NZJenkins/none_token 

Ignore D3DVSDT_NONE
This commit is contained in:
Luke Usher 2019-06-21 13:45:36 +01:00 committed by GitHub
parent 70ef251e4e c3f977f864
commit 3684281bf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/hle/D3D8/XbVertexShader.cpp
View File

@ -2247,14 +2247,21 @@ static void VshConvertToken_STREAMDATA_REG(
break;
case X_D3DVSDT_NONE: // 0x02:
DbgVshPrintf("D3DVSDT_NONE /* xbox ext. */");
HostVertexElementDataType = D3DDECLTYPE_UNUSED;
// NeedPatching = TRUE; // TODO : This seems to cause regressions?
// Ignore token
break;
default:
DbgVshPrintf("Unknown data type for D3DVSD_REG: 0x%02X\n", XboxVertexElementDataType);
break;
}
DbgVshPrintf("),\n");
// On X_D3DVSDT_NONE skip this token
if (XboxVertexElementDataType == X_D3DVSDT_NONE)
{
return;
}
// save patching information
XTL::CxbxVertexShaderStreamElement *pCurrentElement = &(pPatchData->pCurrentVertexShaderStreamInfo->VertexElements[pPatchData->pCurrentVertexShaderStreamInfo->NumberOfVertexElements]);
pCurrentElement->XboxType = XboxVertexElementDataType;
@ -2278,12 +2285,6 @@ static void VshConvertToken_STREAMDATA_REG(
pPatchData->pCurrentVertexShaderStreamInfo->HostVertexStride += HostVertexElementByteSize;
DbgVshPrintf("),\n");
if(HostVertexElementDataType == D3DDECLTYPE_UNUSED)
{
EmuLog(LOG_LEVEL::WARNING, "/* WARNING: Fatal type mismatch, no fitting type! */");
}
}
static void VshConvertToken_STREAMDATA(