Game-Decompilation/cdcEngineDXHR
1
0
Fork 0
mirror of https://github.com/rrika/cdcEngineDXHR.git synced 2024-11-23 21:49:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

silently ignore missing shaders

Browse Source
This commit is contained in:
Adam Jensen 2023-04-04 02:10:23 +01:00
parent 5f60ca526a
commit ec87995800
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rendering/PCDX11Material.cpp
View File

@ -129,7 +129,8 @@ void PCDX11Material::setupPixelResources(
if (doEverything) {
if (subMat->psBufferSize)
stateManager->setPsConstantBuffer(3, constantBuffersPs[subMaterialIndex]);
if (constantBuffersPs[subMaterialIndex]) // HACK
stateManager->setPsConstantBuffer(3, constantBuffersPs[subMaterialIndex]);
// assign 0..refIndexEndA from submaterial
for (uint32_t i = 0; i < subMat->psRefIndexEndA; i++) {
@ -382,14 +383,20 @@ PCDX11StreamDecl *PCDX11Material::SetupDepthPass(
} else {
stateManager->setBlendStateAndBlendFactors(0x6010010, materialBlob->alphaThreshold, 0);
}
pixelTable = static_cast<PCDX11PixelShaderTable*>(static_cast<PCDX11ShaderLib*>(subMaterial->shaderPixel)->table);
auto pixelLib = static_cast<PCDX11ShaderLib*>(subMaterial->shaderPixel);
if (!pixelLib)
return nullptr; // HACK
pixelTable = static_cast<PCDX11PixelShaderTable*>(pixelLib->table);
}
auto pixelShader = (*pixelTable)[pixelIndex];
stateManager->setPixelShader(pixelShader);
// set vertex shader
auto vertexTable = static_cast<PCDX11VertexShaderTable*>(static_cast<PCDX11ShaderLib*>(subMaterial->shaderVertex)->table);
auto vertexLib = static_cast<PCDX11ShaderLib*>(subMaterial->shaderVertex);
if (!vertexLib)
return nullptr;
auto vertexTable = static_cast<PCDX11VertexShaderTable*>(vertexLib->table);
auto vertexShader = (*vertexTable)[vertexIndex];
stateManager->setVertexShader(vertexShader);
@ -560,11 +567,17 @@ PCDX11StreamDecl *PCDX11Material::SetupSinglePass(
vertexIndex |= 8;
uint32_t pixelIndex = 0;
auto pixelTable = static_cast<PCDX11PixelShaderTable*>(static_cast<PCDX11ShaderLib*>(subMaterial->shaderPixel)->table);
auto pixelLib = static_cast<PCDX11ShaderLib*>(subMaterial->shaderPixel);
if (!pixelLib)
return nullptr;
auto pixelTable = static_cast<PCDX11PixelShaderTable*>(pixelLib->table);
auto pixelShader = (*pixelTable)[pixelIndex];
stateManager->setPixelShader(pixelShader);
auto vertexTable = static_cast<PCDX11VertexShaderTable*>(static_cast<PCDX11ShaderLib*>(subMaterial->shaderVertex)->table);
auto vertexLib = static_cast<PCDX11ShaderLib*>(subMaterial->shaderVertex);
if (!vertexLib)
return nullptr;
auto vertexTable = static_cast<PCDX11VertexShaderTable*>(vertexLib->table);
auto vertexShader = (*vertexTable)[vertexIndex];
stateManager->setVertexShader(vertexShader);

6
rendering/PCDX11ModelDrawable.cpp
View File

@ -141,6 +141,9 @@ void PCDX11ModelDrawable::drawComposite(uint32_t funcSetIndex, IRenderDrawable *
if (!thisModel->isUnlit())
thisModel->buildAndAssignLightBuffer(renderDevice, stateManager);
if (!streamDecl)
return; // HACK
thisModel->draw(renderDevice, stateManager, streamDecl, false);
}
@ -194,6 +197,9 @@ void PCDX11ModelDrawable::drawNormal(uint32_t funcSetIndex, IRenderDrawable *dra
thisModel->opacity,
thisModel->float30);
if (!streamDecl)
return; // HACK
thisModel->draw(renderDevice, stateManager, streamDecl, false);
}