rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-02 04:29:14 +01:00
Code Issues Projects Releases Wiki Activity

[dxgi] Fix some issues introduced with FilterModesByDesc cleanup

Browse Source
This commit is contained in:
Philip Rebohle 2019-06-11 15:45:32 +02:00
parent cd6e3ffe75
commit 6d999fad89
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dxgi/dxgi_output.cpp
View File

@ -475,17 +475,30 @@ namespace dxvk {
}); });
} }
bool testScanlineOrder = false;
bool testScaling = false;
bool testFormat = false;
for (const auto& mode : Modes) {
testScanlineOrder |= TargetMode.ScanlineOrdering != DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED
&& TargetMode.ScanlineOrdering == mode.ScanlineOrdering;
testScaling |= TargetMode.Scaling != DXGI_MODE_SCALING_UNSPECIFIED
&& TargetMode.Scaling == mode.Scaling;
testFormat |= TargetMode.Format != DXGI_FORMAT_UNKNOWN
&& TargetMode.Format == mode.Format;
}
for (auto it = Modes.begin(); it != Modes.end(); ) { for (auto it = Modes.begin(); it != Modes.end(); ) {
bool skipMode = it->Stereo != TargetMode.Stereo; bool skipMode = it->Stereo != TargetMode.Stereo;
if (TargetMode.ScanlineOrdering != DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED) if (testScanlineOrder)
skipMode |= it->ScanlineOrdering != TargetMode.ScanlineOrdering; skipMode |= it->ScanlineOrdering != TargetMode.ScanlineOrdering;
if (TargetMode.Scaling != DXGI_MODE_SCALING_UNSPECIFIED) if (testScaling)
skipMode |= it->Scaling != TargetMode.Scaling; skipMode |= it->Scaling != TargetMode.Scaling;
if (TargetMode.Format != DXGI_FORMAT_UNKNOWN) if (testFormat)
skipMode |= it->Scaling != TargetMode.Scaling; skipMode |= it->Format != TargetMode.Format;
if (TargetMode.Width) { if (TargetMode.Width) {
uint32_t diff = std::abs(int32_t(TargetMode.Width - it->Width)) uint32_t diff = std::abs(int32_t(TargetMode.Width - it->Width))