mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into creed2

This commit is contained in:
Philip Rebohle 2024-01-02 19:06:25 +01:00 committed by GitHub
parent 8351d32c2c 5e06cf9573
commit a8b4ceb7cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d9/d3d9_device.cpp
View File

@ -5260,7 +5260,7 @@ namespace dxvk {
uint32_t floatCount = m_vsFloatConstsCount;
if (constSet.meta.needsConstantCopies) {
auto shader = GetCommonShader(m_state.vertexShader);
floatCount = std::max(floatCount, shader->GetMaxDefinedConstant());
floatCount = std::max(floatCount, shader->GetMaxDefinedConstant() + 1);
}
floatCount = std::min(floatCount, constSet.meta.maxConstIndexF);
@ -5322,7 +5322,7 @@ namespace dxvk {
uint32_t floatCount = ShaderStage == DxsoProgramType::VertexShader ? m_vsFloatConstsCount : m_psFloatConstsCount;
if (constSet.meta.needsConstantCopies) {
auto shader = GetCommonShader(Shader);
floatCount = std::max(floatCount, shader->GetMaxDefinedConstant());
floatCount = std::max(floatCount, shader->GetMaxDefinedConstant() + 1);
}
floatCount = std::min(constSet.meta.maxConstIndexF, floatCount);

13
src/util/config/config.cpp
View File

@ -425,6 +425,11 @@ namespace dxvk {
{ R"(\\HoloCure\.exe$)", {{
{ "dxgi.useMonitorFallback", "True" },
}} },
/* Kenshi *
* Helps CPU bound performance */
{ R"(\\kenshi_x64\.exe$)", {{
{ "d3d11.cachedDynamicResources", "v" },
}} },
/**********************************************/
/* D3D9 GAMES */
@ -538,7 +543,7 @@ namespace dxvk {
{ "d3d9.customVendorId", "1002" },
{ "dxgi.emulateUMA", "True" },
{ "d3d9.supportDFFormats", "False" },
{ "d3d9.deviceLostOnFocusLoss", "True" },
{ "d3d9.deviceLossOnFocusLoss", "True" },
}} },
/* Battlefield 2 (bad z-pass) */
{ R"(\\BF2\.exe$)", {{
@ -787,7 +792,7 @@ namespace dxvk {
/* DC Universe Online *
* Freezes after alt tabbing */
{ R"(\\DCGAME\.EXE$)", {{
{ "d3d9.deviceLostOnFocusLoss", "True" },
{ "d3d9.deviceLossOnFocusLoss", "True" },
}} },
/* Halo Online *
* Black textures */
@ -841,6 +846,10 @@ namespace dxvk {
{ R"(\\AssassinsCreedIIGame\.exe$)" , {{
{ "d3d9.deviceLossOnFocusLoss", "True" },
}} },
/* Sonic CD */
{ R"(\\soniccd\.exe$)", {{
{ "d3d9.maxFrameRate", "60" },
}} },
/**********************************************/
/* D3D12 GAMES (vkd3d-proton with dxvk dxgi) */