Ignore D3DVSDT_NONE

This commit is contained in:
Anthony Miles 2019-06-21 21:50:16 +12:00
parent 70ef251e4e
commit c3f977f864
1 changed files with 9 additions and 8 deletions

View File

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