[PATCH v3 0/27] MR10567: wined3d: fix vk swapchain rendering too dark by supporting UNORM to SRGB...

[Stian Low (＠stianlow)]

wined3d: fix vk swapchain rendering too dark by supporting UNORM to SRGB conversion for brightness similar to gl


This merge request addresses: 
https://bugs.winehq.org/show_bug.cgi?id=45364 Frostpunk is very dark


Very dark rendering issues for Frostpunk seem to match the same problem for Vulkan renderer for "Against the Storm":
- https://bugs.winehq.org/show_bug.cgi?id=58632
- https://bugs.winehq.org/attachment.cgi?id=80656


Running both games with gl renderer seems to fix excessive darkness:
- https://bugs.winehq.org/attachment.cgi?id=80654
- https://bugs.winehq.org/attachment.cgi?id=80690


Vulkan renderer seems to be missing SRGB conversion handling availiable for GL renderer.


GL renderer can be forced to render darker the same as Vulkan by bypassing EXT_TEXTURE_SRGB support for ./dlls/wined3d/utils.c:

```
@@ -3133,7 +3146,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win
             continue;
 
         copy_format(adapter, &srgb_format->f, &format->f);
+#if 000
         if (gl_info->supported[EXT_TEXTURE_SRGB]
                 && !(adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL))
         {
@@ -3142,6 +3155,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win
             format_set_caps(&srgb_format->f, WINED3D_FORMAT_CAP_SRGB_READ | WINED3D_FORMAT_CAP_SRGB_WRITE);
             query_internal_format(adapter, srgb_format, &format_texture_info[i], gl_info, TRUE);
         }
+#endif
     }
```


This merge request patch allows Vulkan renderer to perform SRGB conversion for wined3d_swapchain_vk_select_vk_format() to mimic the GL capability.


Changing VkSwapchainCreateInfoKHR imageColorSpace from VK_COLOR_SPACE_SRGB_NONLINEAR_KHR for `wined3d_swapchain_vk_create_vulkan_swapchain()` had no effect despite enabling VK_EXT_swapchain_colorspace for dlls/win32u/vulkan.c `convert_instance_create_info():`

https://docs.vulkan.org/refpages/latest/refpages/source/VkColorSpaceKHR.html


Therefore converting UNORM to SRGB was chosen similar to how the GL renderer seems to handle it:
```
static const struct wined3d_format_srgb_info format_srgb_info[] =
{
    {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM},
    {WINED3DFMT_BC1_UNORM_SRGB,      WINED3DFMT_BC1_UNORM},
    {WINED3DFMT_BC2_UNORM_SRGB,      WINED3DFMT_BC2_UNORM},
    {WINED3DFMT_BC3_UNORM_SRGB,      WINED3DFMT_BC3_UNORM},
    {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_UNORM},
    {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_UNORM},
    {WINED3DFMT_BC7_UNORM_SRGB,      WINED3DFMT_BC7_UNORM},
};
```


Its unclear whether SRGB conversion should always happen or only for particular games so the patch leaves the Vulkan renderer without SRGB conversion by default.


Therefore the patch adds a new WINE_D3D_CONFIG flag named "vk_swap_srgb" to force the Vulkan renderer to perform SRGB conversion for the swapchain.


By default vk_swap_srgb is set to FALSE or 0:
`WINE_D3D_CONFIG=vk_swap_srgb=0,renderer=vulkan`


To force vk_swap_srgb to TRUE or 1:
`WINE_D3D_CONFIG=vk_swap_srgb=1,renderer=vulkan`


For example, launching Frostpunk via the following after the patch fixes the dark rendering for Vulkan and appears brighter similar to the GL renderer:
`WINEDEBUG=-all mangohud --dlsym  WINE_D3D_CONFIG=csmt=0x1,renderer=vulkan,vk_swap_srgb=1 WINEPREFIX=/home/any/wine_stianlow_wow64_new_pfx  ~/tmp/wine_stianlow_wow64_new_install/bin/wine /home/any/wine_stianlow_wow64_new_pfx/drive_c/GOG\ Games/Frostpunk/Frostpunk.exe`


Some SRGB handling was added several years ago but not for mapping UNORM to SRGB that this patch adds:
```
6f55c8d1c56 * wined3d: Use an sRGB fallback format for sRGB formats in wined3d_swapchain_vk_select_vk_format().
Author:     Henri Verbeet <[e-mail]>
CommitDate: Wed Dec 9 16:29:28 2020 +0100
```


If UNORM to SRGB should be enabled by default then this patch may be changed so that vk_swap_srgb defaults to TRUE.

--
  v3: vbscript/tests: Cover top-level Const behavior.
      vbscript: Delegate do_icall is_call branch to variant_call.
      vbscript: Raise illegal-func-call on empty parens of class variant property.
      vbscript/tests: Cover empty parens on properties, Dim variables, and arrays.
      ws2_32: Exclude not found and loopback addresses in get_local_ips() if others present.
      ws2_32/tests: Properly check for loopback address in test_gethostbyname().
 
This merge request has too many patches to be relayed via email.
Please visit the URL below to see the contents of the merge request.
https://gitlab.winehq.org/wine/wine/-/merge_requests/10567