piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

ShaderGen: Remove virtual methods from ShaderGeneratorInterface, move string buffer to ShaderCode

Browse Source 
This fixes the crashes occuring at startup with a non-empty shader cache.
Because LinearDiskCache reads/writes to the storage of ShaderUid, ShaderUid must be trivially copyable.
Additionally, adds a static assert to LinearDiskCache to ensure this doesn't happen in the future.

The initialization of ShaderUid data has been moved to the code generation functions, so the above condition holds true.
This commit is contained in:
Stenzek
2016-01-02 16:20:01 +10:00
parent 066af14272
commit 617f9d9532
6 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/PixelShaderGen.cpp
View File

@ -168,7 +168,9 @@ static T GeneratePixelShader(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType)
// Non-uid template parameters will write to the dummy data (=> gets optimized out)
pixel_shader_uid_data dummy_data;
pixel_shader_uid_data* uid_data = out.template GetUidData<pixel_shader_uid_data>();
if (uid_data == nullptr)
if (uid_data != nullptr)
memset(uid_data, 0, sizeof(*uid_data));
else
uid_data = &dummy_data;
unsigned int numStages = bpmem.genMode.numtevstages + 1;