1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-11-29 01:24:11 +01:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Tiagoquix
b1f5bfe9f4
Merge f740918239 into 4e07302cbf 2024-11-28 10:29:04 +02:00
Jeff
4e07302cbf [d3d9] Fix race condition in PIX events 2024-11-28 07:24:12 +00:00
Tiagoquix
f740918239
[util] Separate Borderlands 2 fixes from Borderlands: The Pre-Sequel 2024-11-25 15:35:23 -03:00
2 changed files with 14 additions and 6 deletions

View File

@ -127,6 +127,7 @@ namespace dxvk {
INT STDMETHODCALLTYPE D3D9UserDefinedAnnotation::BeginEvent(
D3DCOLOR Color,
LPCWSTR Name) {
D3D9DeviceLock lock = m_container->LockDevice();
m_container->EmitCs([color = Color, labelName = dxvk::str::fromws(Name)](DxvkContext *ctx) {
VkDebugUtilsLabelEXT label;
label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
@ -143,6 +144,7 @@ namespace dxvk {
INT STDMETHODCALLTYPE D3D9UserDefinedAnnotation::EndEvent() {
D3D9DeviceLock lock = m_container->LockDevice();
m_container->EmitCs([](DxvkContext *ctx) {
ctx->endDebugLabel();
});
@ -155,6 +157,7 @@ namespace dxvk {
void STDMETHODCALLTYPE D3D9UserDefinedAnnotation::SetMarker(
D3DCOLOR Color,
LPCWSTR Name) {
D3D9DeviceLock lock = m_container->LockDevice();
m_container->EmitCs([color = Color, labelName = dxvk::str::fromws(Name)](DxvkContext *ctx) {
VkDebugUtilsLabelEXT label;
label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;

View File

@ -469,17 +469,22 @@ namespace dxvk {
{ R"(\\anarchyonline\.exe$)", {{
{ "d3d9.memoryTrackTest", "True" },
}} },
/* Borderlands 2 and The Pre Sequel! *
* Missing lava in Vault of the Warrior *
* without Strict floats */
{ R"(\\Borderlands(2|PreSequel)\.exe$)", {{
/* Borderlands */
{ R"(\\Borderlands\.exe$)", {{
{ "d3d9.lenientClear", "True" },
}} },
/* Borderlands 2 *
* Missing lava in Vault of the Warrior *
* without Strict floats */
{ R"(\\Borderlands2\.exe$)", {{
{ "d3d9.lenientClear", "True" },
{ "d3d9.supportDFFormats", "False" },
{ "d3d9.floatEmulation", "Strict" },
}} },
/* Borderlands */
{ R"(\\Borderlands\.exe$)", {{
/* Borderlands: The Pre-Sequel */
{ R"(\\BorderlandsPreSequel\.exe$)", {{
{ "d3d9.lenientClear", "True" },
{ "d3d9.supportDFFormats", "False" },
}} },
/* Gothic 3 */
{ R"(\\Gothic(3|3Final| III Forsaken Gods)\.exe$)", {{