September 2019 - Wine-Devel

[PATCH 5/7] scrobj: Add IActiveScriptSiteWindow stub implementation.
by Jacek Caban Sept. 20, 2019

Sept. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

1 0

[PATCH 4/7] scrobj: Add stub IActiveScriptSite implementation.
by Jacek Caban Sept. 20, 2019

Sept. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 221 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 4 deletions(-)

1 0

[PATCH 3/7] scrobj: Suport scriptlet registration.
by Jacek Caban Sept. 20, 2019

Sept. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 168 ++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 18 +++- 2 files changed, 180 insertions(+), 6 deletions(-)

1 0

[PATCH 2/7] scrobj: Add script element parser partial implementation.
by Jacek Caban Sept. 20, 2019

Sept. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 72 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] scrobj: Add public element parser implementation.
by Jacek Caban Sept. 20, 2019

Sept. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 121 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 2 deletions(-)

1 0

[PATCH 5/5] wined3d: Initialise the multi-sample draw location for the Vulkan adapter.
by Henri Verbeet Sept. 20, 2019

Sept. 20, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2e72269632a..ef2734f0551 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1105,6 +1105,17 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes, sysmem_bytes); } +static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter *adapter, uint32_t wined3d_creation_flags) +{ + struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + + d3d_info->wined3d_creation_flags = wined3d_creation_flags; + + d3d_info->texture_swizzle = TRUE; + + d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; +} + static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -1156,8 +1167,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; - adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; - adapter->d3d_info.texture_swizzle = TRUE; + wined3d_adapter_vk_init_d3d_info(adapter, wined3d_creation_flags); return TRUE; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Retrieve the supported sample counts for Vulkan formats.
by Henri Verbeet Sept. 20, 2019

Sept. 20, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 82027bf19c1..cc217c73224 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4160,10 +4160,13 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; + VkImageFormatProperties image_properties; VkFormatFeatureFlags texture_flags; VkFormatProperties properties; + VkImageUsageFlags vk_usage; unsigned int flags; unsigned int i; + VkResult vr; for (i = 0; i < ARRAY_SIZE(vulkan_formats); ++i) { @@ -4211,6 +4214,22 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] |= flags; format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] |= flags; format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= flags; + + vk_usage = 0; + if (texture_flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) + vk_usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + else if (texture_flags & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + vk_usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + if (vk_usage) + { + if ((vr = VK_CALL(vkGetPhysicalDeviceImageFormatProperties(vk_physical_device, vk_format, + VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_OPTIMAL, vk_usage, 0, &image_properties))) < 0) + { + ERR("Failed to get image format properties, vr %s.\n", wined3d_debug_vkresult(vr)); + return; + } + format->f.multisample_types = image_properties.sampleCounts; + } } BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk, -- 2.11.0

1 0

[PATCH 3/5] wined3d: Explicitly initialise sRGB format info.
by Henri Verbeet Sept. 20, 2019

Sept. 20, 2019

For the GL adapter this already happens implicitly in init_format_texture_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e10d617b4e9..82027bf19c1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2171,6 +2171,24 @@ static BOOL init_format_decompress_info(struct wined3d_adapter *adapter) return TRUE; } +static BOOL init_srgb_formats(struct wined3d_adapter *adapter) +{ + struct wined3d_format *format, *srgb_format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) + { + if (!(srgb_format = get_format_internal(adapter, format_srgb_info[i].srgb_format_id))) + return FALSE; + if (!(format = get_format_internal(adapter, format_srgb_info[i].base_format_id))) + return FALSE; + + copy_format(adapter, srgb_format, format); + } + + return TRUE; +} + static GLenum wined3d_gl_type_to_enum(enum wined3d_gl_resource_type type) { switch (type) @@ -3990,6 +4008,8 @@ static BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, si goto fail; if (!init_format_decompress_info(adapter)) goto fail; + if (!init_srgb_formats(adapter)) + goto fail; return TRUE; -- 2.11.0

1 0

[PATCH 2/5] wined3d: More accurately determine whether a separate sRGB texture is required.
by Henri Verbeet Sept. 20, 2019

Sept. 20, 2019

Read control is irrelevant without WINED3D_BIND_SHADER_RESOURCE, write control is irrelevant without WINED3D_BIND_RENDER_TARGET. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d30cb315c2..58977f8cd12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5077,12 +5077,20 @@ static inline BOOL is_srgb_enabled(const DWORD *sampler_states) static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { - unsigned int flags = texture->resource.format_flags - & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + if (!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) + return FALSE; + + if (!context->d3d_info->srgb_read_control + && (texture->resource.bind_flags & WINED3D_BIND_SHADER_RESOURCE) + && (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_READ)) + return TRUE; - return (!context->d3d_info->srgb_read_control - || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) - && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; + if (!context->d3d_info->srgb_write_control + && (texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET) + && (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) + return TRUE; + + return FALSE; } static inline BOOL needs_srgb_write(const struct wined3d_context *context, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Add GPU information for AMD VEGA12.
by Henri Verbeet Sept. 20, 2019

Sept. 20, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fd03ce63494..8cb83ee884c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -398,6 +398,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, /* Red Hat */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10d076edccc..1d30cb315c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2413,6 +2413,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, + CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_NVIDIA_RIVA_128 = 0x0018, -- 2.11.0

1 0