May 2019 - Wine-Devel - list.winehq.org

[PATCH 2/2] hidclass.sys: Support canceling read IRPs.
by Jacek Caban May 8, 2019

May 8, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 46 +++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-)

2 1

[PATCH 1/2] hidclass.sys: Make read IRP queue thread safe.
by Jacek Caban May 8, 2019

May 8, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/hidclass.sys/Makefile.in | 2 +- dlls/hidclass.sys/device.c | 34 ++++++++++++++++++++++++---------- dlls/hidclass.sys/hid.h | 1 + dlls/hidclass.sys/pnp.c | 1 + 4 files changed, 27 insertions(+), 11 deletions(-)

2 1

[PATCH 4/8] add processthreadapi.h
by Roman Stingler May 8, 2019

May 8, 2019

Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> --- include/processthreadapi.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 include/processthreadapi.h diff --git a/include/processthreadapi.h b/include/processthreadapi.h new file mode 100644 index 0000000000..4a99770a15 --- /dev/null +++ b/include/processthreadapi.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2019 Roman Stingler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _PROCESSTHREADAPI_H +#define _PROCESSTHREADAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum _CPU_SET_INFORMATION_TYPE { + CpuSetInformation +} CPU_SET_INFORMATION_TYPE, *PCPU_SET_INFORMATION_TYPE; + + +WINBASEAPI BOOL WINAPI SetThreadSelectedCpuSets(HANDLE,const ULONG *,ULONG); + +#ifdef __cplusplus +} +#endif + +#endif //WINE_SOURCE_PROCESSTHREADAPI_H -- 2.21.0

1 0

[PATCH vkd3d 6/6] tests: Add VKD3D_TEST_BUG env var to control bug_if() conditions.
by Józef Kucia May 8, 2019

May 8, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Run tests with VKD3D_TEST_BUG=0 to disable bug_if() conditions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 53afdd90358d..a37f6ff70ce4 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -116,6 +116,7 @@ static struct unsigned int bug_level; bool bug_do_loop; + bool bug_enabled; char context[1024]; } vkd3d_test_state; @@ -165,7 +166,7 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg bool is_todo = vkd3d_test_state.todo_level && !vkd3d_test_platform_is_windows(); bool is_bug = vkd3d_test_state.bug_level && !vkd3d_test_platform_is_windows(); - if (is_bug) + if (is_bug && vkd3d_test_state.bug_enabled) { InterlockedIncrement(&vkd3d_test_state.bug_count); if (is_todo) @@ -255,9 +256,11 @@ int main(int argc, char **argv) { const char *debug_level = getenv("VKD3D_TEST_DEBUG"); char *test_platform = getenv("VKD3D_TEST_PLATFORM"); + const char *bug = getenv("VKD3D_TEST_BUG"); memset(&vkd3d_test_state, 0, sizeof(vkd3d_test_state)); - vkd3d_test_state.debug_level = !debug_level ? 0 : atoi(debug_level); + vkd3d_test_state.debug_level = debug_level ? atoi(debug_level) : 0; + vkd3d_test_state.bug_enabled = bug ? atoi(bug) : true; if (test_platform) { -- 2.21.0

2 1

[PATCH vkd3d 3/6] vkd3d: Use D32_SFLOAT_S8_UINT when D24_UNORM_S8_UINT is not supported.
by Józef Kucia May 8, 2019

May 8, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes rendering in UE4 Infiltrator Demo on AMD. Adjustments for depth bias aren't implemented yet. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 12 +++++++++ libs/vkd3d/device.c | 8 +++++- libs/vkd3d/utils.c | 53 ++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 5 ++++ tests/d3d12.c | 7 ----- 5 files changed, 75 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 57415deb2ba3..abe4f27ecb24 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3233,6 +3233,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic return; } + if (dst_format->is_emulated) + { + FIXME("Format %#x is not supported yet.\n", dst_format->dxgi_format); + return; + } + if ((dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); @@ -3256,6 +3262,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic return; } + if (src_format->is_emulated) + { + FIXME("Format %#x is not supported yet.\n", src_format->dxgi_format); + return; + } + if ((src_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) && (src_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) FIXME("Depth-stencil format %#x not fully supported yet.\n", src_format->dxgi_format); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index f1ad09033ccd..a107e1e6414c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1897,6 +1897,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_private_store_destroy(&device->private_store); + vkd3d_cleanup_depth_stencil_formats(device); vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_render_pass_cache_cleanup(&device->render_pass_cache, device); @@ -3090,9 +3091,12 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) goto out_free_private_store; - if (FAILED(hr = vkd3d_init_null_resources(&device->null_resources, device))) + if (FAILED(hr = vkd3d_init_depth_stencil_formats(device))) goto out_stop_fence_worker; + if (FAILED(hr = vkd3d_init_null_resources(&device->null_resources, device))) + goto out_cleanup_depth_stencil_formats; + vkd3d_render_pass_cache_init(&device->render_pass_cache); vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); @@ -3101,6 +3105,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, return S_OK; +out_cleanup_depth_stencil_formats: + vkd3d_cleanup_depth_stencil_formats(device); out_stop_fence_worker: vkd3d_fence_worker_stop(&device->fence_worker, device); out_free_private_store: diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 06a958de179a..ea468b37d37d 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -132,6 +132,53 @@ static const struct vkd3d_format vkd3d_depth_stencil_formats[] = #undef STENCIL #undef DEPTH_STENCIL +HRESULT vkd3d_init_depth_stencil_formats(struct d3d12_device *device) +{ + const unsigned int count = ARRAY_SIZE(vkd3d_depth_stencil_formats); + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkFormatProperties properties; + struct vkd3d_format *formats; + unsigned int i; + + VK_CALL(vkGetPhysicalDeviceFormatProperties(device->vk_physical_device, + VK_FORMAT_D24_UNORM_S8_UINT, &properties)); + + if (properties.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + { + device->depth_stencil_formats = vkd3d_depth_stencil_formats; + } + else + { + /* AMD doesn't support VK_FORMAT_D24_UNORM_S8_UINT. */ + WARN("Mapping VK_FORMAT_D24_UNORM_S8_UINT to VK_FORMAT_D32_SFLOAT_S8_UINT.\n"); + + if (!(formats = vkd3d_calloc(count, sizeof(*formats)))) + return E_OUTOFMEMORY; + + memcpy(formats, vkd3d_depth_stencil_formats, sizeof(vkd3d_depth_stencil_formats)); + for (i = 0; i < count; ++i) + { + if (formats[i].vk_format == VK_FORMAT_D24_UNORM_S8_UINT) + { + formats[i].vk_format = VK_FORMAT_D32_SFLOAT_S8_UINT; + formats[i].is_emulated = true; + } + } + + device->depth_stencil_formats = formats; + } + + return S_OK; +} + +void vkd3d_cleanup_depth_stencil_formats(struct d3d12_device *device) +{ + if (vkd3d_depth_stencil_formats != device->depth_stencil_formats) + vkd3d_free((void *)device->depth_stencil_formats); + + device->depth_stencil_formats = NULL; +} + /* We use overrides for depth/stencil formats. This is required in order to * properly support typeless formats because depth/stencil formats are only * compatible with themselves in Vulkan. @@ -139,14 +186,16 @@ static const struct vkd3d_format vkd3d_depth_stencil_formats[] = static const struct vkd3d_format *vkd3d_get_depth_stencil_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format) { + const struct vkd3d_format *formats; unsigned int i; assert(device); + formats = device->depth_stencil_formats; for (i = 0; i < ARRAY_SIZE(vkd3d_depth_stencil_formats); ++i) { - if (vkd3d_depth_stencil_formats[i].dxgi_format == dxgi_format) - return &vkd3d_depth_stencil_formats[i]; + if (formats[i].dxgi_format == dxgi_format) + return &formats[i]; } return NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 915f63475330..057a0a7c0dea 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1006,6 +1006,7 @@ struct d3d12_device HRESULT removed_reason; + const struct vkd3d_format *depth_stencil_formats; struct vkd3d_null_resources null_resources; }; @@ -1027,6 +1028,7 @@ struct vkd3d_format size_t block_height; size_t block_byte_count; VkImageAspectFlags vk_aspect_mask; + bool is_emulated; }; static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) @@ -1037,6 +1039,9 @@ static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; +HRESULT vkd3d_init_depth_stencil_formats(struct d3d12_device *device) DECLSPEC_HIDDEN; +void vkd3d_cleanup_depth_stencil_formats(struct d3d12_device *device) DECLSPEC_HIDDEN; + bool dxgi_format_is_typeless(DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( diff --git a/tests/d3d12.c b/tests/d3d12.c index d5f491e190f1..c1992a81923b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17749,13 +17749,6 @@ static void test_depth_stencil_sampling(void) { vkd3d_test_set_context("Test %u", i); - /* FIXME: Implement format substitution. */ - if (tests[i].typeless_format == DXGI_FORMAT_R24G8_TYPELESS && is_radv_device(device)) - { - skip("radv doesn't support VK_FORMAT_D24_UNORM_S8_UINT.\n"); - continue; - } - reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width, -- 2.21.0

2 1

[PATCH vkd3d 2/6] vkd3d: Pass device to vkd3d_get_format().
by Józef Kucia May 8, 2019

May 8, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 8 ++++---- libs/vkd3d/resource.c | 12 ++++++------ libs/vkd3d/state.c | 14 +++++++------- libs/vkd3d/utils.c | 12 ++++++++---- libs/vkd3d/vkd3d_private.h | 5 +++-- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index b1f320b9d214..f1ad09033ccd 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2103,8 +2103,8 @@ static HRESULT d3d12_device_check_multisample_quality_levels(struct d3d12_device if (data->Format == DXGI_FORMAT_UNKNOWN) goto done; - if (!(format = vkd3d_get_format(data->Format, false))) - format = vkd3d_get_format(data->Format, true); + if (!(format = vkd3d_get_format(device, data->Format, false))) + format = vkd3d_get_format(device, data->Format, true); if (!format) { FIXME("Unhandled format %#x.\n", data->Format); @@ -2257,8 +2257,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->Support1 = D3D12_FORMAT_SUPPORT1_NONE; data->Support2 = D3D12_FORMAT_SUPPORT2_NONE; - if (!(format = vkd3d_get_format(data->Format, false))) - format = vkd3d_get_format(data->Format, true); + if (!(format = vkd3d_get_format(device, data->Format, false))) + format = vkd3d_get_format(device, data->Format, true); if (!format) { FIXME("Unhandled format %#x.\n", data->Format); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b0a9c9ae1f03..36fcb22e857a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1701,12 +1701,12 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, if (view_format == DXGI_FORMAT_R32_TYPELESS && (flags & VKD3D_VIEW_RAW_BUFFER)) { - format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); element_size = format->byte_count; } else if (view_format == DXGI_FORMAT_UNKNOWN && structure_stride) { - format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); element_size = structure_stride; } else if ((format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, view_format))) @@ -2055,7 +2055,7 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, WARN("Creating NULL SRV %#x.\n", desc->ViewDimension); - vkd3d_desc.format = vkd3d_get_format(VKD3D_NULL_VIEW_FORMAT, 0); + vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, 0); vkd3d_desc.miplevel_idx = 0; vkd3d_desc.miplevel_count = 1; vkd3d_desc.layer_idx = 0; @@ -2258,7 +2258,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ assert(d3d12_resource_is_buffer(counter_resource)); assert(desc->u.Buffer.StructureByteStride); - format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); if (!vkd3d_create_vk_buffer_view(device, counter_resource, format, desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) { @@ -2272,7 +2272,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ if ((desc->Format == DXGI_FORMAT_R32_TYPELESS && (desc->u.Buffer.Flags & VKD3D_VIEW_RAW_BUFFER)) || desc->Format == DXGI_FORMAT_R32_UINT) { - const struct vkd3d_format *format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + const struct vkd3d_format *format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); descriptor->uav.buffer.offset = desc->u.Buffer.FirstElement * format->byte_count; descriptor->uav.buffer.size = desc->u.Buffer.NumElements * format->byte_count; @@ -2367,7 +2367,7 @@ bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, const struct vkd3d_format *format; struct d3d12_resource *resource; - format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, gpu_address); return vkd3d_create_vk_buffer_view(device, resource, format, gpu_address - resource->gpu_address, VK_WHOLE_SIZE, vk_buffer_view); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 054a9aea1a4f..2b7059ccb390 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1969,8 +1969,8 @@ static bool is_dual_source_blending(const D3D12_RENDER_TARGET_BLEND_DESC *desc) || is_dual_source_blending_blend(desc->DestBlendAlpha)); } -static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input_layout_desc, - uint32_t *offsets) +static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, + const D3D12_INPUT_LAYOUT_DESC *input_layout_desc, uint32_t *offsets) { uint32_t input_slot_offsets[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT] = {0}; const D3D12_INPUT_ELEMENT_DESC *e; @@ -1993,7 +1993,7 @@ static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input return E_INVALIDARG; } - if (!(format = vkd3d_get_format(e->Format, false))) + if (!(format = vkd3d_get_format(device, e->Format, false))) { WARN("Invalid input element format %#x.\n", e->Format); return E_INVALIDARG; @@ -2145,7 +2145,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s { const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; - if (!(format = vkd3d_get_format(desc->DSVFormat, true))) + if (!(format = vkd3d_get_format(device, desc->DSVFormat, true))) { WARN("Invalid DSV format %#x.\n", desc->DSVFormat); hr = E_INVALIDARG; @@ -2183,7 +2183,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; size_t idx = graphics->rt_idx + i; - if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) + if (!(format = vkd3d_get_format(device, desc->RTVFormats[i], false))) { WARN("Invalid RTV format %#x.\n", desc->RTVFormats[i]); hr = E_INVALIDARG; @@ -2368,7 +2368,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - if (FAILED(hr = compute_input_layout_offsets(&desc->InputLayout, aligned_offsets))) + if (FAILED(hr = compute_input_layout_offsets(device, &desc->InputLayout, aligned_offsets))) goto fail; graphics->instance_divisor_count = 0; @@ -2377,7 +2377,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s const D3D12_INPUT_ELEMENT_DESC *e = &desc->InputLayout.pInputElementDescs[i]; const struct vkd3d_shader_signature_element *signature_element; - if (!(format = vkd3d_get_format(e->Format, false))) + if (!(format = vkd3d_get_format(device, e->Format, false))) { WARN("Invalid input element format %#x.\n", e->Format); hr = E_INVALIDARG; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index afa4da3fad5d..06a958de179a 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -136,10 +136,13 @@ static const struct vkd3d_format vkd3d_depth_stencil_formats[] = * properly support typeless formats because depth/stencil formats are only * compatible with themselves in Vulkan. */ -static const struct vkd3d_format *vkd3d_get_depth_stencil_format(DXGI_FORMAT dxgi_format) +static const struct vkd3d_format *vkd3d_get_depth_stencil_format(const struct d3d12_device *device, + DXGI_FORMAT dxgi_format) { unsigned int i; + assert(device); + for (i = 0; i < ARRAY_SIZE(vkd3d_depth_stencil_formats); ++i) { if (vkd3d_depth_stencil_formats[i].dxgi_format == dxgi_format) @@ -149,12 +152,13 @@ static const struct vkd3d_format *vkd3d_get_depth_stencil_format(DXGI_FORMAT dxg return NULL; } -const struct vkd3d_format *vkd3d_get_format(DXGI_FORMAT dxgi_format, bool depth_stencil) +const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, + DXGI_FORMAT dxgi_format, bool depth_stencil) { const struct vkd3d_format *format; unsigned int i; - if (depth_stencil && (format = vkd3d_get_depth_stencil_format(dxgi_format))) + if (depth_stencil && (format = vkd3d_get_depth_stencil_format(device, dxgi_format))) return format; for (i = 0; i < ARRAY_SIZE(vkd3d_formats); ++i) @@ -170,7 +174,7 @@ VkFormat vkd3d_get_vk_format(DXGI_FORMAT format) { const struct vkd3d_format *vkd3d_format; - if (!(vkd3d_format = vkd3d_get_format(format, false))) + if (!(vkd3d_format = vkd3d_get_format(NULL, format, false))) return VK_FORMAT_UNDEFINED; return vkd3d_format->vk_format; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0de0abf6b9e5..915f63475330 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1034,14 +1034,15 @@ static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) return format->block_byte_count != 1; } -const struct vkd3d_format *vkd3d_get_format(DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; +const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, + DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; bool dxgi_format_is_typeless(DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( const struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, DXGI_FORMAT view_format) { - return vkd3d_get_format(view_format ? view_format : desc->Format, + return vkd3d_get_format(device, view_format ? view_format : desc->Format, desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL); } -- 2.21.0

2 1

[PATCH vkd3d 1/6] vkd3d: Pass device to vkd3d_format_from_d3d12_resource_desc().
by Józef Kucia May 8, 2019

May 8, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 34 ++++++++++++++++++++-------------- libs/vkd3d/device.c | 5 +++-- libs/vkd3d/resource.c | 8 +++++--- libs/vkd3d/vkd3d_private.h | 2 +- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 960d3be429d2..57415deb2ba3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2029,7 +2029,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 assert(d3d12_resource_is_texture(resource)); - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, 0))) + if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) { ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); return; @@ -3226,8 +3226,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic assert(d3d12_resource_is_buffer(dst_resource)); assert(d3d12_resource_is_texture(src_resource)); - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&src_resource->desc, - dst->u.PlacedFootprint.Footprint.Format))) + if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, + &src_resource->desc, dst->u.PlacedFootprint.Footprint.Format))) { WARN("Invalid format %#x.\n", dst->u.PlacedFootprint.Footprint.Format); return; @@ -3249,8 +3249,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic assert(d3d12_resource_is_texture(dst_resource)); assert(d3d12_resource_is_buffer(src_resource)); - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, - src->u.PlacedFootprint.Footprint.Format))) + if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, + &dst_resource->desc, src->u.PlacedFootprint.Footprint.Format))) { WARN("Invalid format %#x.\n", src->u.PlacedFootprint.Footprint.Format); return; @@ -3272,12 +3272,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic assert(d3d12_resource_is_texture(dst_resource)); assert(d3d12_resource_is_texture(src_resource)); - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) + if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, + &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", dst_resource->desc.Format); return; } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(&src_resource->desc, DXGI_FORMAT_UNKNOWN))) + if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, + &src_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", src_resource->desc.Format); return; @@ -3348,12 +3350,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm } else { - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) + if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, + &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", dst_resource->desc.Format); return; } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(&src_resource->desc, DXGI_FORMAT_UNKNOWN))) + if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, + &src_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", src_resource->desc.Format); return; @@ -3398,12 +3402,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi const struct vkd3d_format *src_format, *dst_format, *vk_format; struct d3d12_resource *dst_resource, *src_resource; const struct vkd3d_vk_device_procs *vk_procs; + const struct d3d12_device *device; VkImageResolve vk_image_resolve; TRACE("iface %p, dst_resource %p, dst_sub_resource_idx %u, src_resource %p, src_sub_resource_idx %u, " "format %#x.\n", iface, dst, dst_sub_resource_idx, src, src_sub_resource_idx, format); - vk_procs = &list->device->vk_procs; + device = list->device; + vk_procs = &device->vk_procs; dst_resource = unsafe_impl_from_ID3D12Resource(dst); src_resource = unsafe_impl_from_ID3D12Resource(src); @@ -3416,12 +3422,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi d3d12_command_list_end_current_render_pass(list); - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) + if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(device, &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", dst_resource->desc.Format); return; } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(&src_resource->desc, DXGI_FORMAT_UNKNOWN))) + if (!(src_format = vkd3d_format_from_d3d12_resource_desc(device, &src_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", src_resource->desc.Format); return; @@ -3429,7 +3435,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi if (dxgi_format_is_typeless(dst_resource->desc.Format) || dxgi_format_is_typeless(src_resource->desc.Format)) { - if (!(vk_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, format))) + if (!(vk_format = vkd3d_format_from_d3d12_resource_desc(device, &dst_resource->desc, format))) { WARN("Invalid format %#x.\n", format); return; @@ -3736,7 +3742,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC const struct vkd3d_format *format; VkImageMemoryBarrier vk_barrier; - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, 0))) + if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) { ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); continue; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cb2934a23afb..b1f320b9d214 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2631,7 +2631,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour if (info->Alignment < D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) { - if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid format %#x.\n", desc->Format); goto invalid; @@ -2840,6 +2840,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i UINT64 base_offset, D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, UINT *row_counts, UINT64 *row_sizes, UINT64 *total_bytes) { + struct d3d12_device *device = impl_from_ID3D12Device(iface); static const struct vkd3d_format vkd3d_format_unknown = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; @@ -2866,7 +2867,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i { format = &vkd3d_format_unknown; } - else if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) + else if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid format %#x.\n", desc->Format); return; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index aba850f27206..b0a9c9ae1f03 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -577,7 +577,7 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, VkImageCreateInfo image_info; VkResult vr; - if (!(format = vkd3d_format_from_d3d12_resource_desc(desc, 0))) + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid DXGI format %#x.\n", desc->Format); return E_INVALIDARG; @@ -1709,7 +1709,7 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); element_size = structure_stride; } - else if ((format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, view_format))) + else if ((format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, view_format))) { element_size = format->byte_count; } @@ -1888,7 +1888,9 @@ struct vkd3d_texture_view_desc static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, struct d3d12_resource *resource, DXGI_FORMAT view_format) { - if (!(desc->format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, view_format))) + const struct d3d12_device *device = resource->device; + + if (!(desc->format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, view_format))) { FIXME("Failed to find format (resource format %#x, view format %#x).\n", resource->desc.Format, view_format); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8314298e9b41..0de0abf6b9e5 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1039,7 +1039,7 @@ const struct vkd3d_format *vkd3d_get_format(DXGI_FORMAT dxgi_format, bool depth_ bool dxgi_format_is_typeless(DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( - const D3D12_RESOURCE_DESC *desc, DXGI_FORMAT view_format) + const struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, DXGI_FORMAT view_format) { return vkd3d_get_format(view_format ? view_format : desc->Format, desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL); -- 2.21.0

2 1

[PATCH 5/5] wined3d: Pass a wined3d_context_gl structure to context_load_tex_coords().
by Henri Verbeet May 8, 2019

May 8, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 +++++++------ dlls/wined3d/state.c | 3 ++- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e52e4bcff53..97d765658b0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5036,19 +5036,19 @@ void context_unload_tex_coords(const struct wined3d_context *context) } } -void context_load_tex_coords(const struct wined3d_context *context, const struct wined3d_stream_info *si, - GLuint *current_bo, const struct wined3d_state *state) +void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, + const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_format_gl *format_gl; unsigned int mapped_stage = 0; unsigned int texture_idx; - for (texture_idx = 0; texture_idx < context->d3d_info->limits.ffp_blend_stages; ++texture_idx) + for (texture_idx = 0; texture_idx < context_gl->c.d3d_info->limits.ffp_blend_stages; ++texture_idx) { unsigned int coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; - if ((mapped_stage = context->tex_unit_map[texture_idx]) == WINED3D_UNMAPPED_STAGE) + if ((mapped_stage = context_gl->c.tex_unit_map[texture_idx]) == WINED3D_UNMAPPED_STAGE) continue; if (mapped_stage >= gl_info->limits.texture_coords) @@ -5116,6 +5116,7 @@ static void context_unload_vertex_data(struct wined3d_context *context) static void context_load_vertex_data(struct wined3d_context *context, const struct wined3d_stream_info *si, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_stream_info_element *e; const struct wined3d_format_gl *format_gl; @@ -5305,7 +5306,7 @@ static void context_load_vertex_data(struct wined3d_context *context, } /* Texture coordinates */ - context_load_tex_coords(context, si, &current_bo, state); + wined3d_context_gl_load_tex_coords(context_gl, si, &current_bo, state); } static void context_unload_numbered_array(struct wined3d_context *context, unsigned int i) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1d2ffbbc981..0f35f2afa42 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3315,6 +3315,7 @@ static void transform_texture(struct wined3d_context *context, const struct wine static void tex_coordindex(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const GLfloat s_plane[] = { 1.0f, 0.0f, 0.0f, 0.0f }; static const GLfloat t_plane[] = { 0.0f, 1.0f, 0.0f, 0.0f }; static const GLfloat r_plane[] = { 0.0f, 0.0f, 1.0f, 0.0f }; @@ -3483,7 +3484,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; context_unload_tex_coords(context); - context_load_tex_coords(context, &context->stream_info, &curVBO, state); + wined3d_context_gl_load_tex_coords(context_gl, &context->stream_info, &curVBO, state); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd27c6edc72..a226cd4796a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2054,6 +2054,8 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, + const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; struct wined3d_fb_state { @@ -2236,8 +2238,6 @@ void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; -void context_load_tex_coords(const struct wined3d_context *context, const struct wined3d_stream_info *si, - GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; struct wined3d_context *context_reacquire(const struct wined3d_device *device, -- 2.11.0

2 1

[PATCH 4/5] wined3d: Move the extension emulation fields from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet May 8, 2019

May 8, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/gl_compat.c | 241 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 18 +-- 2 files changed, 159 insertions(+), 100 deletions(-) diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index a2fb09c39e1..c1491d4c631 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -149,121 +149,168 @@ static void WINE_GLAPI wine_glGetDoublev(GLenum pname, GLdouble* params) { } /* Start GL_EXT_fogcoord emulation */ -static void (WINE_GLAPI *old_fogcoord_glEnable) (GLenum cap) = NULL; -static void WINE_GLAPI wine_glEnable(GLenum cap) { - if(cap == GL_FOG) { - struct wined3d_context *ctx = context_get_current(); +static void (WINE_GLAPI *old_fogcoord_glEnable)(GLenum cap); +static void WINE_GLAPI wine_glEnable(GLenum cap) +{ + if (cap == GL_FOG) + { + struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + ctx->fog_enabled = 1; - if(ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) return; + if (ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) + return; } old_fogcoord_glEnable(cap); } -static void (WINE_GLAPI *old_fogcoord_glDisable) (GLenum cap) = NULL; -static void WINE_GLAPI wine_glDisable(GLenum cap) { - if(cap == GL_FOG) { - struct wined3d_context *ctx = context_get_current(); +static void (WINE_GLAPI *old_fogcoord_glDisable)(GLenum cap); +static void WINE_GLAPI wine_glDisable(GLenum cap) +{ + if (cap == GL_FOG) + { + struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + ctx->fog_enabled = 0; - if(ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) return; + if (ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) + return; } old_fogcoord_glDisable(cap); } -static void (WINE_GLAPI *old_fogcoord_glFogi) (GLenum pname, GLint param) = NULL; -static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { - struct wined3d_context *ctx = context_get_current(); +static void (WINE_GLAPI *old_fogcoord_glFogi)(GLenum pname, GLint param); +static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) +{ + struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); - if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { + if (pname == GL_FOG_COORDINATE_SOURCE_EXT) + { ctx->gl_fog_source = param; - if(param == GL_FRAGMENT_DEPTH_EXT) { - if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); - } else { - WARN_(d3d_perf)("Fog coords activated, but not supported. Using slow emulation\n"); - old_fogcoord_glDisable(GL_FOG); + if (param == GL_FRAGMENT_DEPTH_EXT) + { + if (ctx->fog_enabled) + old_fogcoord_glEnable(GL_FOG); } - } else { - if(pname == GL_FOG_START) { - ctx->fogstart = (float) param; - } else if(pname == GL_FOG_END) { - ctx->fogend = (float) param; + else + { + WARN_(d3d_perf)("Fog coordinates activated, but not supported. Using slow emulation.\n"); + old_fogcoord_glDisable(GL_FOG); } + } + else + { + if (pname == GL_FOG_START) + ctx->fog_start = (float)param; + else if (pname == GL_FOG_END) + ctx->fog_end = (float)param; old_fogcoord_glFogi(pname, param); } } -static void (WINE_GLAPI *old_fogcoord_glFogiv) (GLenum pname, const GLint *param) = NULL; -static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { - struct wined3d_context *ctx = context_get_current(); - if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { +static void (WINE_GLAPI *old_fogcoord_glFogiv)(GLenum pname, const GLint *param); +static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) +{ + struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + + if (pname == GL_FOG_COORDINATE_SOURCE_EXT) + { ctx->gl_fog_source = *param; - if(*param == GL_FRAGMENT_DEPTH_EXT) { - if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); - } else { - WARN_(d3d_perf)("Fog coords activated, but not supported. Using slow emulation\n"); - old_fogcoord_glDisable(GL_FOG); + if (*param == GL_FRAGMENT_DEPTH_EXT) + { + if (ctx->fog_enabled) + old_fogcoord_glEnable(GL_FOG); } - } else { - if(pname == GL_FOG_START) { - ctx->fogstart = (float) *param; - } else if(pname == GL_FOG_END) { - ctx->fogend = (float) *param; + else + { + WARN_(d3d_perf)("Fog coordinates activated, but not supported. Using slow emulation.\n"); + old_fogcoord_glDisable(GL_FOG); } + } + else + { + if (pname == GL_FOG_START) + ctx->fog_start = (float)*param; + else if (pname == GL_FOG_END) + ctx->fog_end = (float)*param; old_fogcoord_glFogiv(pname, param); } } -static void (WINE_GLAPI *old_fogcoord_glFogf) (GLenum pname, GLfloat param) = NULL; -static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { - struct wined3d_context *ctx = context_get_current(); - if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - ctx->gl_fog_source = (GLint) param; - if(param == GL_FRAGMENT_DEPTH_EXT) { - if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); - } else { - WARN_(d3d_perf)("Fog coords activated, but not supported. Using slow emulation\n"); - old_fogcoord_glDisable(GL_FOG); +static void (WINE_GLAPI *old_fogcoord_glFogf)(GLenum pname, GLfloat param); +static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) +{ + struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + + if (pname == GL_FOG_COORDINATE_SOURCE_EXT) + { + ctx->gl_fog_source = (GLint)param; + if (param == GL_FRAGMENT_DEPTH_EXT) + { + if (ctx->fog_enabled) + old_fogcoord_glEnable(GL_FOG); } - } else { - if(pname == GL_FOG_START) { - ctx->fogstart = param; - } else if(pname == GL_FOG_END) { - ctx->fogend = param; + else + { + WARN_(d3d_perf)("Fog coordinates activated, but not supported. Using slow emulation.\n"); + old_fogcoord_glDisable(GL_FOG); } + } + else + { + if (pname == GL_FOG_START) + ctx->fog_start = param; + else if (pname == GL_FOG_END) + ctx->fog_end = param; old_fogcoord_glFogf(pname, param); } } -static void (WINE_GLAPI *old_fogcoord_glFogfv) (GLenum pname, const GLfloat *param) = NULL; -static void WINE_GLAPI wine_glFogfv(GLenum pname, const GLfloat *param) { - struct wined3d_context *ctx = context_get_current(); - if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - ctx->gl_fog_source = (GLint) *param; - if(*param == GL_FRAGMENT_DEPTH_EXT) { - if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); - } else { - WARN_(d3d_perf)("Fog coords activated, but not supported. Using slow emulation\n"); +static void (WINE_GLAPI *old_fogcoord_glFogfv)(GLenum pname, const GLfloat *param); +static void WINE_GLAPI wine_glFogfv(GLenum pname, const GLfloat *param) +{ + struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + + if (pname == GL_FOG_COORDINATE_SOURCE_EXT) + { + ctx->gl_fog_source = (GLint)*param; + if (*param == GL_FRAGMENT_DEPTH_EXT) + { + if (ctx->fog_enabled) + old_fogcoord_glEnable(GL_FOG); + } + else + { + WARN_(d3d_perf)("Fog coordinates activated, but not supported. Using slow emulation.\n"); old_fogcoord_glDisable(GL_FOG); } - } else { - if(pname == GL_FOG_COLOR) { - ctx->fogcolor[0] = param[0]; - ctx->fogcolor[1] = param[1]; - ctx->fogcolor[2] = param[2]; - ctx->fogcolor[3] = param[3]; - } else if(pname == GL_FOG_START) { - ctx->fogstart = *param; - } else if(pname == GL_FOG_END) { - ctx->fogend = *param; + } + else + { + if (pname == GL_FOG_COLOR) + { + ctx->fog_colour[0] = param[0]; + ctx->fog_colour[1] = param[1]; + ctx->fog_colour[2] = param[2]; + ctx->fog_colour[3] = param[3]; + } + else if (pname == GL_FOG_START) + { + ctx->fog_start = *param; + } + else if (pname == GL_FOG_END) + { + ctx->fog_end = *param; } old_fogcoord_glFogfv(pname, param); } } -static void (WINE_GLAPI *old_fogcoord_glVertex4f) (GLfloat x, GLfloat y, GLfloat z, GLfloat w) = NULL; -static void (WINE_GLAPI *old_fogcoord_glColor4f) (GLfloat r, GLfloat g, GLfloat b, GLfloat a) = NULL; +static void (WINE_GLAPI *old_fogcoord_glVertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); +static void (WINE_GLAPI *old_fogcoord_glColor4f)(GLfloat r, GLfloat g, GLfloat b, GLfloat a); -static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { +static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) +{ struct wined3d_context *ctx = context_get_current(); + struct wined3d_context_gl *ctx_gl; /* This can be called from draw_test_quad() and at that point there is no * wined3d_context current. */ @@ -272,18 +319,23 @@ static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat old_fogcoord_glVertex4f(x, y, z, w); return; } - if(ctx->gl_fog_source == GL_FOG_COORDINATE_EXT && ctx->fog_enabled) { - GLfloat c[4] = {ctx->color[0], ctx->color[1], ctx->color[2], ctx->color[3]}; + + ctx_gl = wined3d_context_gl(ctx); + if (ctx_gl->gl_fog_source == GL_FOG_COORDINATE_EXT && ctx_gl->fog_enabled) + { + GLfloat c[4] = {ctx_gl->colour[0], ctx_gl->colour[1], ctx_gl->colour[2], ctx_gl->colour[3]}; GLfloat i; - i = (ctx->fogend - ctx->fog_coord_value) / (ctx->fogend - ctx->fogstart); - c[0] = i * c[0] + (1.0f - i) * ctx->fogcolor[0]; - c[1] = i * c[1] + (1.0f - i) * ctx->fogcolor[1]; - c[2] = i * c[2] + (1.0f - i) * ctx->fogcolor[2]; + i = (ctx_gl->fog_end - ctx_gl->fog_coord_value) / (ctx_gl->fog_end - ctx_gl->fog_start); + c[0] = i * c[0] + (1.0f - i) * ctx_gl->fog_colour[0]; + c[1] = i * c[1] + (1.0f - i) * ctx_gl->fog_colour[1]; + c[2] = i * c[2] + (1.0f - i) * ctx_gl->fog_colour[2]; old_fogcoord_glColor4f(c[0], c[1], c[2], c[3]); old_fogcoord_glVertex4f(x, y, z, w); - } else { + } + else + { old_fogcoord_glVertex4f(x, y, z, w); } } @@ -300,8 +352,10 @@ static void WINE_GLAPI wine_glVertex3fv(const GLfloat *pos) { wine_glVertex4f(pos[0], pos[1], pos[2], 1.0f); } -static void WINE_GLAPI wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { +static void WINE_GLAPI wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) +{ struct wined3d_context *ctx = context_get_current(); + struct wined3d_context_gl *ctx_gl; /* This can be called from draw_test_quad() and at that point there is no * wined3d_context current. */ @@ -310,10 +364,12 @@ static void WINE_GLAPI wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a old_fogcoord_glColor4f(r, g, b, a); return; } - ctx->color[0] = r; - ctx->color[1] = g; - ctx->color[2] = b; - ctx->color[3] = a; + + ctx_gl = wined3d_context_gl(ctx); + ctx_gl->colour[0] = r; + ctx_gl->colour[1] = g; + ctx_gl->colour[2] = b; + ctx_gl->colour[3] = a; old_fogcoord_glColor4f(r, g, b, a); } @@ -333,11 +389,12 @@ static void WINE_GLAPI wine_glColor4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte wine_glColor4f(r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f); } -/* In D3D the fog coord is a UBYTE, so there's no problem with using the single - * precision function - */ -static void WINE_GLAPI wine_glFogCoordfEXT(GLfloat f) { - struct wined3d_context *ctx = context_get_current(); +/* In D3D the fog coord is a UBYTE, so there's no problem with using the + * single precision function. */ +static void WINE_GLAPI wine_glFogCoordfEXT(GLfloat f) +{ + struct wined3d_context_gl *ctx = wined3d_context_gl(context_get_current()); + ctx->fog_coord_value = f; } static void WINE_GLAPI wine_glFogCoorddEXT(GLdouble f) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b7172a6dc5..fd27c6edc72 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1919,9 +1919,9 @@ struct wined3d_context DWORD last_was_blit : 1; DWORD last_was_ckey : 1; DWORD fog_coord : 1; - DWORD fog_enabled : 1; DWORD current : 1; DWORD destroyed : 1; + DWORD destroy_delayed : 1; DWORD valid : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ @@ -1939,13 +1939,12 @@ struct wined3d_context DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; DWORD uses_uavs : 1; - DWORD destroy_delayed : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD num_untracked_materials : 2; /* Max value 2 */ - DWORD padding : 7; + DWORD padding : 8; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -2019,11 +2018,6 @@ struct wined3d_context DWORD tex_unit_map[WINED3D_MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS]; - /* Extension emulation */ - GLint gl_fog_source; - GLfloat fog_coord_value; - GLfloat color[4], fogstart, fogend, fogcolor[4]; - unsigned int viewport_count; unsigned int scissor_rect_count; }; @@ -2037,8 +2031,16 @@ struct wined3d_context_gl { struct wined3d_context c; + uint32_t fog_enabled : 1; + uint32_t padding : 31; + GLenum *texture_type; + /* Extension emulation. */ + GLint gl_fog_source; + GLfloat fog_coord_value; + GLfloat colour[4], fog_start, fog_end, fog_colour[4]; + GLuint dummy_arbfp_prog; }; -- 2.11.0

2 1

[PATCH 3/5] wined3d: Store the glEnableWINE and glDisableWINE pointers in the wined3d_gl_info structure.
by Henri Verbeet May 8, 2019

May 8, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/context.c | 2 +- dlls/wined3d/gl_compat.c | 8 ++++---- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 3 --- dlls/wined3d/wined3d_private.h | 3 +++ 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1f4ba793ed8..8a9cbede249 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4653,8 +4653,8 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, } #endif - glEnableWINE = gl_info->gl_ops.gl.p_glEnable; - glDisableWINE = gl_info->gl_ops.gl.p_glDisable; + gl_info->p_glEnableWINE = gl_info->gl_ops.gl.p_glEnable; + gl_info->p_glDisableWINE = gl_info->gl_ops.gl.p_glDisable; if (!wined3d_caps_gl_ctx_create(&adapter_gl->a, &caps_gl_ctx)) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index eb64f14f480..e52e4bcff53 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2978,7 +2978,7 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, const struct /* Other misc states. */ gl_info->gl_ops.gl.p_glDisable(GL_LIGHTING); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_LIGHTING)); - glDisableWINE(GL_FOG); + gl_info->p_glDisableWINE(GL_FOG); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_FOGENABLE)); if (gl_info->supported[EXT_SECONDARY_COLOR]) diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 7e6b5101bc4..a2fb09c39e1 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -437,10 +437,10 @@ void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_ gl_info->gl_ops.gl.p_glFogf = wine_glFogf; old_fogcoord_glFogfv = gl_info->gl_ops.gl.p_glFogfv; gl_info->gl_ops.gl.p_glFogfv = wine_glFogfv; - old_fogcoord_glEnable = glEnableWINE; - glEnableWINE = wine_glEnable; - old_fogcoord_glDisable = glDisableWINE; - glDisableWINE = wine_glDisable; + old_fogcoord_glEnable = gl_info->p_glEnableWINE; + gl_info->p_glEnableWINE = wine_glEnable; + old_fogcoord_glDisable = gl_info->p_glDisableWINE; + gl_info->p_glDisableWINE = wine_glDisable; old_fogcoord_glVertex4f = gl_info->gl_ops.gl.p_glVertex4f; gl_info->gl_ops.gl.p_glVertex4f = wine_glVertex4f; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f2ae39e565b..1d2ffbbc981 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1125,7 +1125,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st if (!state->render_states[WINED3D_RS_FOGENABLE]) { /* No fog? Disable it, and we're done :-) */ - glDisableWINE(GL_FOG); + gl_info->p_glDisableWINE(GL_FOG); checkGLcall("glDisable GL_FOG"); return; } @@ -1262,7 +1262,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st } } - glEnableWINE(GL_FOG); + gl_info->p_glEnableWINE(GL_FOG); checkGLcall("glEnable GL_FOG"); if (new_source != context->fog_source || fogstart == fogend) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 5241b6c41e1..0e5ae5e1721 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -28,9 +28,6 @@ #define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 /* not in the gl spec */ -void (WINE_GLAPI *glDisableWINE)(GLenum cap) DECLSPEC_HIDDEN; -void (WINE_GLAPI *glEnableWINE)(GLenum cap) DECLSPEC_HIDDEN; - /* OpenGL extensions. */ enum wined3d_gl_extension { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b649a479f71..2b7172a6dc5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2656,6 +2656,9 @@ struct wined3d_gl_info HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; struct wined3d_fbo_ops fbo_ops; + + void (WINE_GLAPI *p_glDisableWINE)(GLenum cap); + void (WINE_GLAPI *p_glEnableWINE)(GLenum cap); }; /* The driver names reflect the lowest GPU supported -- 2.11.0

2 1