March 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfplat: Rename media buffer structure to better reflect its usage.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 81c7633154215c86d39e7e8c49aad5608b500d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=81c7633154215c86d39e7e8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:34 2021 +0300 mfplat: Rename media buffer structure to better reflect its usage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 118 +++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81c7633154215c86d39e…

1 0

Nikolay Sivov : mfplat: Always initialize output arguments in GetScanline0AndPitch() for d3d9 buffers.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: ca52f07565b52718f87881849bff136cf053c07c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca52f07565b52718f8788184… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:33 2021 +0300 mfplat: Always initialize output arguments in GetScanline0AndPitch() for d3d9 buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e6bf52662e8..d4efafdea45 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -689,7 +689,11 @@ static HRESULT WINAPI d3d9_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa EnterCriticalSection(&buffer->cs); if (!buffer->_2d.locks) + { + *scanline0 = NULL; + *pitch = 0; hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); + } else { *scanline0 = buffer->d3d9_surface.rect.pBits;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_stream_output().
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 212ccdaccf068e312cd0438da0e5ee28352b8960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=212ccdaccf068e312cd0438d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 24 18:19:28 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_stream_output(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4a61cdae904..c9bc9443e5d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1364,18 +1364,18 @@ static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_STREAM_OUTPUT); } -void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset) +void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context *context, unsigned int stream_idx, + struct wined3d_buffer *buffer, unsigned int offset) { struct wined3d_cs_set_stream_output *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUT; op->stream_idx = stream_idx; op->buffer = buffer; op->offset = offset; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 067fdecf3cf..9766dfada2d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1242,7 +1242,7 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT wined3d_buffer_incref(buffer); stream->buffer = buffer; stream->offset = offset; - wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); + wined3d_device_context_emit_set_stream_output(&device->cs->c, idx, buffer, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); } @@ -1766,7 +1766,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) { - wined3d_cs_emit_set_stream_output(device->cs, i, + wined3d_device_context_emit_set_stream_output(context, i, state->stream_output[i].buffer, state->stream_output[i].offset); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24237d0bdd7..ba86cb7ebdb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4761,8 +4761,6 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, - struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; @@ -4818,6 +4816,8 @@ void wined3d_device_context_emit_set_shader(struct wined3d_device_context *conte void wined3d_device_context_emit_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int view_idx, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context *context, unsigned int stream_idx, + struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11/tests: Test multiple instanced step rates.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: ccef69cfad48a3a5119a5b6f24907d015dc528df URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccef69cfad48a3a5119a5b6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 15:52:52 2021 -0500 d3d11/tests: Test multiple instanced step rates. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 129 +++++++++++++++++++++++++++++------------------ 1 file changed, 79 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ccef69cfad48a3a5119a…

1 0

Nikolay Sivov : mfplat: Implement Lock2DSize() for d3d11 buffers.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 78ab39559429838ad15208b3c42144b201917375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ab39559429838ad15208b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:35 2021 +0300 mfplat: Implement Lock2DSize() for d3d11 buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index dd88a661e45..77767c27d94 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1019,9 +1019,34 @@ static HRESULT WINAPI dxgi_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - FIXME("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); + struct buffer *buffer = impl_from_IMF2DBuffer2(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); + + if (!scanline0 || !pitch || !buffer_start || !buffer_length) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + if (buffer->_2d.linear_buffer) + hr = MF_E_UNEXPECTED; + else if (!buffer->_2d.locks++) + hr = dxgi_surface_buffer_map(buffer); + + if (SUCCEEDED(hr)) + { + *scanline0 = buffer->dxgi_surface.map_desc.pData; + *pitch = buffer->dxgi_surface.map_desc.RowPitch; + if (buffer_start) + *buffer_start = *scanline0; + if (buffer_length) + *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; + } + + LeaveCriticalSection(&buffer->cs); + + return hr; } static HRESULT WINAPI dxgi_buffer_QueryInterface(IMFDXGIBuffer *iface, REFIID riid, void **obj)

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_vertex_declaration().
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: a130d55cdea31e709bc71f9871d6dcd341ab0b24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a130d55cdea31e709bc71f98… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 24 18:19:25 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_vertex_declaration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 468819b604b..4a61cdae904 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1273,15 +1273,16 @@ static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const device_invalidate_state(cs->c.device, STATE_VDECL); } -void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) +void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_context *context, + struct wined3d_vertex_declaration *declaration) { struct wined3d_cs_set_vertex_declaration *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VERTEX_DECLARATION; op->declaration = declaration; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c3ad3dae3fe..666b2829f7e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1762,7 +1762,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 } wined3d_device_context_emit_set_depth_stencil_view(context, state->fb.depth_stencil); - wined3d_cs_emit_set_vertex_declaration(device->cs, state->vertex_declaration); + wined3d_device_context_emit_set_vertex_declaration(context, state->vertex_declaration); for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i) { @@ -1899,7 +1899,7 @@ void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, if (declaration) wined3d_vertex_declaration_incref(declaration); state->vertex_declaration = declaration; - wined3d_cs_emit_set_vertex_declaration(device->cs, declaration); + wined3d_device_context_emit_set_vertex_declaration(&device->cs->c, declaration); if (prev) wined3d_vertex_declaration_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c43695e5f0..24237d0bdd7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4770,8 +4770,6 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, - struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, @@ -4825,6 +4823,8 @@ void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_vertex_declaration(struct wined3d_device_context *context, + struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Trace wined3d_swapchain_vk_blit() failures.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 46c50c03ce1adfe7e77e06a9a95fc1122b2e6a01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46c50c03ce1adfe7e77e06a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:41 2021 +0100 wined3d: Trace wined3d_swapchain_vk_blit() failures. These are expected failures in some circumstances, but we'd still like to know about them when they happen. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8f365c88c15..95db586c697 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1063,7 +1063,10 @@ static VkResult wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain wined3d_context_vk_wait_command_buffer(context_vk, swapchain_vk->vk_semaphores[present_idx].command_buffer_id); if ((vr = VK_CALL(vkAcquireNextImageKHR(device_vk->vk_device, swapchain_vk->vk_swapchain, UINT64_MAX, swapchain_vk->vk_semaphores[present_idx].available, VK_NULL_HANDLE, &image_idx))) < 0) + { + WARN("Failed to acquire image, vr %s.\n", wined3d_debug_vkresult(vr)); return vr; + } if (dst_rect->right > swapchain_vk->width || dst_rect->bottom > swapchain_vk->height) { @@ -1154,7 +1157,9 @@ static VkResult wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain present_desc.pSwapchains = &swapchain_vk->vk_swapchain; present_desc.pImageIndices = &image_idx; present_desc.pResults = NULL; - return VK_CALL(vkQueuePresentKHR(device_vk->vk_queue, &present_desc)); + if ((vr = VK_CALL(vkQueuePresentKHR(device_vk->vk_queue, &present_desc)))) + WARN("Present returned vr %s.\n", wined3d_debug_vkresult(vr)); + return vr; } static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context_vk *context_vk)

1 0

Henri Verbeet : wined3d: Handle a few more border colours for Vulkan samplers.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 177696a103ad5df3f84520d8ab8409e8a8587a05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=177696a103ad5df3f84520d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:40 2021 +0100 wined3d: Handle a few more border colours for Vulkan samplers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 9381c5d3fb9..7eb3a2ae0be 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -172,6 +172,33 @@ static VkSamplerAddressMode vk_address_mode_from_wined3d(enum wined3d_texture_ad } } +static VkBorderColor vk_border_colour_from_wined3d(const struct wined3d_color *colour) +{ + unsigned int i; + + static const struct + { + struct wined3d_color wined3d_colour; + VkBorderColor vk_colour; + } + colours[] = + { + {{0.0f, 0.0f, 0.0f, 0.0f}, VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK}, + {{0.0f, 0.0f, 0.0f, 1.0f}, VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK}, + {{1.0f, 1.0f, 1.0f, 1.0f}, VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE}, + }; + + for (i = 0; i < ARRAY_SIZE(colours); ++i) + { + if (!memcmp(&colours[i], colour, sizeof(*colour))) + return colours[i].vk_colour; + } + + FIXME("Unhandled border colour {%.8e, %.8e, %.8e, %.8e}.\n", colour->r, colour->g, colour->b, colour->a); + + return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; +} + static void wined3d_sampler_vk_cs_init(void *object) { struct wined3d_sampler_vk *sampler_vk = object; @@ -211,13 +238,9 @@ static void wined3d_sampler_vk_cs_init(void *object) sampler_desc.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; sampler_desc.unnormalizedCoordinates = VK_FALSE; - if ((desc->address_u == WINED3D_TADDRESS_BORDER || desc->address_v == WINED3D_TADDRESS_BORDER + if (desc->address_u == WINED3D_TADDRESS_BORDER || desc->address_v == WINED3D_TADDRESS_BORDER || desc->address_w == WINED3D_TADDRESS_BORDER) - && (desc->border_color[0] != 0.0f || desc->border_color[1] != 0.0f - || desc->border_color[2] != 0.0f || desc->border_color[3] != 0.0f)) - FIXME("Unhandled border colour {%.8e, %.8e, %.8e, %.8e}.\n", - desc->border_color[0], desc->border_color[1], - desc->border_color[2], desc->border_color[3]); + sampler_desc.borderColor = vk_border_colour_from_wined3d((const struct wined3d_color *)desc->border_color); if (desc->mip_base_level) FIXME("Unhandled mip_base_level %u.\n", desc->mip_base_level); if ((d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) && !desc->srgb_decode)

1 0

Henri Verbeet : dxgi: Implement dxgi_output_SetGammaControl().
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: e27ea1e03af5adcb63134c2bd7fc15ffe6a9d2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27ea1e03af5adcb63134c2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:43 2021 +0100 dxgi: Implement dxgi_output_SetGammaControl(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 3ffa5d16408..632b44526c1 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -420,10 +420,45 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOu return S_OK; } +static WORD uint16_from_float(float f) +{ + f *= 65535.0f; + if (f < 0.0f) + f = 0.0f; + else if (f > 65535.0f) + f = 65535.0f; + + return f + 0.5f; +} + static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput6 *iface, const DXGI_GAMMA_CONTROL *gamma_control) { - FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); + struct wined3d_gamma_ramp ramp; + const DXGI_RGB *p; + unsigned int i; + + TRACE("iface %p, gamma_control %p.\n", iface, gamma_control); + + if (gamma_control->Scale.Red != 1.0f || gamma_control->Scale.Green != 1.0f || gamma_control->Scale.Blue != 1.0f) + FIXME("Ignoring unhandled scale {%.8e, %.8e, %.8e}.\n", gamma_control->Scale.Red, + gamma_control->Scale.Green, gamma_control->Scale.Blue); + if (gamma_control->Offset.Red != 0.0f || gamma_control->Offset.Green != 0.0f || gamma_control->Offset.Blue != 0.0f) + FIXME("Ignoring unhandled offset {%.8e, %.8e, %.8e}.\n", gamma_control->Offset.Red, + gamma_control->Offset.Green, gamma_control->Offset.Blue); + + for (i = 0; i < 256; ++i) + { + p = &gamma_control->GammaCurve[i]; + ramp.red[i] = uint16_from_float(p->Red); + ramp.green[i] = uint16_from_float(p->Green); + ramp.blue[i] = uint16_from_float(p->Blue); + } + + wined3d_mutex_lock(); + wined3d_output_set_gamma_ramp(output->wined3d_output, &ramp); + wined3d_mutex_unlock(); return S_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c673f61e429..95fa744d64d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1496,6 +1496,19 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, return WINED3D_OK; } +HRESULT CDECL wined3d_output_set_gamma_ramp(struct wined3d_output *output, const struct wined3d_gamma_ramp *ramp) +{ + HDC dc; + + TRACE("output %p, ramp %p.\n", output, ramp); + + dc = CreateDCW(output->device_name, NULL, NULL, NULL); + SetDeviceGammaRamp(dc, (void *)ramp); + DeleteDC(dc); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, DWORD flags, struct wined3d_adapter_identifier *identifier) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4f0d1e8e0b3..fb9973354a0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -192,6 +192,7 @@ @ cdecl wined3d_output_get_raster_status(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_set_display_mode(ptr ptr) +@ cdecl wined3d_output_set_gamma_ramp(ptr ptr) @ cdecl wined3d_output_take_ownership(ptr long) @ cdecl wined3d_palette_create(ptr long long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e8f5e824bc3..1f8b4a89648 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2606,6 +2606,7 @@ HRESULT __cdecl wined3d_output_get_raster_status(const struct wined3d_output *ou void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_set_display_mode(struct wined3d_output *output, const struct wined3d_display_mode *mode); +HRESULT __cdecl wined3d_output_set_gamma_ramp(struct wined3d_output *output, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags,

1 0

Henri Verbeet : wined3d: Invalidate sRGB write state in wined3d_cs_exec_set_rendertarget_view() if needed.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: b1c84499544354e75505cc366352c72c010d735e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c84499544354e75505cc36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:42 2021 +0100 wined3d: Invalidate sRGB write state in wined3d_cs_exec_set_rendertarget_view() if needed. Instead of in wined3d_context_gl_setup_target(). If the render-target view uses an sRGB format, but the underlying resource has a typeless format, we'd potentially miss an invalidation in wined3d_context_gl_setup_target() where we only have access to the underlying resource. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/context_gl.c | 5 ----- dlls/wined3d/cs.c | 18 +++++++++++++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3e8cbfb18b4..38a0afc3fee 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15184,7 +15184,7 @@ static void test_swapchain_views(void) ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); - todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); + check_texture_color(test_context.backbuffer, 0xffbc957c, 1); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index fa61b70f525..123214afd5d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4122,11 +4122,6 @@ static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_g if ((old->alpha_size && !new->alpha_size) || (!old->alpha_size && new->alpha_size) || !(texture->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) context_invalidate_state(&context_gl->c, STATE_BLEND); - - /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ - if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) - != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } /* When switching away from an offscreen render target, and we're not diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c9bc9443e5d..6bf9827d3e1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1191,17 +1191,29 @@ void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_rendertarget_view *op = data; - BOOL prev_alpha_swizzle, curr_alpha_swizzle; + bool prev_alpha_swizzle, curr_alpha_swizzle; struct wined3d_rendertarget_view *prev; + bool prev_srgb_write, curr_srgb_write; + struct wined3d_device *device; + device = cs->c.device; prev = cs->state.fb.render_targets[op->view_idx]; cs->state.fb.render_targets[op->view_idx] = op->view; - device_invalidate_state(cs->c.device, STATE_FRAMEBUFFER); + device_invalidate_state(device, STATE_FRAMEBUFFER); prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; curr_alpha_swizzle = op->view && op->view->format->id == WINED3DFMT_A8_UNORM; if (prev_alpha_swizzle != curr_alpha_swizzle) - device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + device_invalidate_state(device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + + if (!(device->adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + || cs->state.render_states[WINED3D_RS_SRGBWRITEENABLE]) + { + prev_srgb_write = prev && prev->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + curr_srgb_write = op->view && op->view->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + if (prev_srgb_write != curr_srgb_write) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + } } void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_context *context, unsigned int view_idx,

1 0