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

Fix a crash when converting certain, large vertex shaders 

This allows DOA3 to play again after it was broken by the HLSL work.

The cause of the crash was a Stack Overflow when compiling the shader,
caused by allocating a large object on the stack.

Instead, this commit allocates the XboxVertexShaderDecoder on the heap
instead, which thanks to the unique_ptr smart pointer, automatically
gets freed when it goes out of scope.
This commit is contained in:
Luke Usher 2020-01-01 22:29:28 +00:00
parent f101389704
commit e937bc13d9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1615,7 +1615,7 @@ extern HRESULT EmuRecompileVshFunction
{
XTL::X_VSH_SHADER_HEADER* pXboxVertexShaderHeader = (XTL::X_VSH_SHADER_HEADER*)pXboxFunction;
uint32_t* pToken;
XboxVertexShaderDecoder VshDecoder;
std::unique_ptr<XboxVertexShaderDecoder> VshDecoder = std::make_unique<XboxVertexShaderDecoder>();
ID3DBlob* pErrors = nullptr;
HRESULT hRet = 0;
@ -1654,7 +1654,7 @@ extern HRESULT EmuRecompileVshFunction
// Decode the vertex shader program tokens into an intermediate representation
pToken = (uint32_t*)((uintptr_t)pXboxFunction + sizeof(XTL::X_VSH_SHADER_HEADER));
while (VshDecoder.VshConvertToIntermediate(pToken)) {
while (VshDecoder->VshConvertToIntermediate(pToken)) {
pToken += X_VSH_INSTRUCTION_SIZE;
}
@ -1664,7 +1664,7 @@ extern HRESULT EmuRecompileVshFunction
auto hlsl_stream = std::stringstream();
hlsl_stream << hlsl_template[0]; // Start with the HLSL template header
if (!VshDecoder.BuildShader(hlsl_stream)) {
if (!VshDecoder->BuildShader(hlsl_stream)) {
// Do not attempt to compile empty shaders
// This is a declaration only shader, so there is no function to recompile
*pbUseDeclarationOnly = true;