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

Nikolay Sivov : mfplat: Implement Lock2DSize() for d3d11 buffers.
by Alexandre Julliard 25 Mar '21

25 Mar '21

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 25 Mar '21

25 Mar '21

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

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_vertex_declaration().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 55b088831468b4e524f57c6995970fab8466fac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b088831468b4e524f57c69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 24 18:19:26 2021 -0500 wined3d: Introduce wined3d_device_context_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/device.c | 34 +++++++++++++++++++++------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 666b2829f7e..067fdecf3cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1887,21 +1887,9 @@ struct wined3d_device_context * CDECL wined3d_device_get_immediate_context(struc void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_vertex_declaration *prev; - TRACE("device %p, declaration %p.\n", device, declaration); - prev = state->vertex_declaration; - if (declaration == prev) - return; - - if (declaration) - wined3d_vertex_declaration_incref(declaration); - state->vertex_declaration = declaration; - wined3d_device_context_emit_set_vertex_declaration(&device->cs->c, declaration); - if (prev) - wined3d_vertex_declaration_decref(prev); + wined3d_device_context_set_vertex_declaration(&device->cs->c, declaration); } struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device) @@ -2381,6 +2369,26 @@ void CDECL wined3d_device_context_set_index_buffer(struct wined3d_device_context wined3d_buffer_decref(prev_buffer); } +void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_context *context, + struct wined3d_vertex_declaration *declaration) +{ + struct wined3d_state *state = context->state; + struct wined3d_vertex_declaration *prev; + + TRACE("context %p, declaration %p.\n", context, declaration); + + prev = state->vertex_declaration; + if (declaration == prev) + return; + + if (declaration) + wined3d_vertex_declaration_incref(declaration); + state->vertex_declaration = declaration; + wined3d_device_context_emit_set_vertex_declaration(context, declaration); + if (prev) + wined3d_vertex_declaration_decref(prev); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 54d4ef4c23c..4f0d1e8e0b3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -180,6 +180,7 @@ @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) +@ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3937f1f5be2..e8f5e824bc3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2584,6 +2584,8 @@ HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_c void __cdecl wined3d_device_context_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int idx, struct wined3d_unordered_access_view *uav, unsigned int initial_count); +void __cdecl wined3d_device_context_set_vertex_declaration(struct wined3d_device_context *context, + struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports);

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_vertex_declaration().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 460fb42f97558fbb9a07cbb2039a59b135a4f164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460fb42f97558fbb9a07cbb2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 24 18:19:27 2021 -0500 d3d11: Use wined3d_device_context_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/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9b2652b49ec..67781c57ef5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -653,13 +653,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext1 *iface, ID3D11InputLayout *input_layout) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_input_layout *layout = unsafe_impl_from_ID3D11InputLayout(input_layout); TRACE("iface %p, input_layout %p.\n", iface, input_layout); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, layout ? layout->wined3d_decl : NULL); + wined3d_device_context_set_vertex_declaration(context->wined3d_context, layout ? layout->wined3d_decl : NULL); wined3d_mutex_unlock(); } @@ -2616,7 +2616,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon wined3d_device_context_set_stream_source(context->wined3d_context, i, NULL, 0, 0); } wined3d_device_context_set_index_buffer(context->wined3d_context, NULL, WINED3DFMT_UNKNOWN, 0); - wined3d_device_set_vertex_declaration(device->wined3d_device, NULL); + wined3d_device_context_set_vertex_declaration(context->wined3d_context, NULL); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_UNDEFINED, 0); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) {

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_stream_output().
by Alexandre Julliard 25 Mar '21

25 Mar '21

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 : wined3d: Require vertexAttributeInstanceRateZeroDivisor.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 1eff85d2f718e92f5fcb6e876f94a20d13ef7d3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eff85d2f718e92f5fcb6e87… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 15:52:49 2021 -0500 wined3d: Require vertexAttributeInstanceRateZeroDivisor. 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/adapter_vk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b784be6ab04..7303c994eb4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -319,11 +319,8 @@ struct wined3d_physical_device_info static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info *info) { - VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features = &info->vertex_divisor_features; VkPhysicalDeviceFeatures *features = &info->features2.features; - vertex_divisor_features->vertexAttributeInstanceRateZeroDivisor = VK_FALSE; - features->depthBounds = VK_FALSE; features->alphaToOne = VK_FALSE; features->textureCompressionETC2 = VK_FALSE; @@ -447,7 +444,8 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi else VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2->features)); - if (!vertex_divisor_features->vertexAttributeInstanceRateDivisor) + if (!vertex_divisor_features->vertexAttributeInstanceRateDivisor + || !vertex_divisor_features->vertexAttributeInstanceRateZeroDivisor) { WARN("Vertex attribute divisors not supported.\n"); hr = E_FAIL;

1 0

Zebediah Figura : wined3d: Implement zero step rate for instanced attributes.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 4d345a78bf1fad113e73f80a739eadfbc4babe62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d345a78bf1fad113e73f80a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 15:52:50 2021 -0500 wined3d: Implement zero step rate for instanced attributes. 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/context.c | 5 +++-- dlls/wined3d/context_gl.c | 6 +++++- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 118ac2aad8a..2debf50de7f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -238,16 +238,17 @@ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_inf if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { stream_info->elements[idx].divisor = 1; + stream_info->elements[idx].instanced = true; } else if (element->input_slot_class == WINED3D_INPUT_PER_INSTANCE_DATA) { stream_info->elements[idx].divisor = element->instance_data_step_rate; - if (!element->instance_data_step_rate) - FIXME("Instance step rate 0 not implemented.\n"); + stream_info->elements[idx].instanced = true; } else { stream_info->elements[idx].divisor = 0; + stream_info->elements[idx].instanced = false; } if (!d3d_info->vertex_bgra && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a51e5ec9095..fa61b70f525 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5378,7 +5378,11 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { - GL_EXTCALL(glVertexAttribDivisor(i, element->divisor)); + unsigned int divisor = 0; + + if (element->instanced) + divisor = element->divisor ? element->divisor : UINT_MAX; + GL_EXTCALL(glVertexAttribDivisor(i, divisor)); } else if (element->divisor) { diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index eedfed315ce..45133eabb69 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2061,9 +2061,9 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte b = &key->bindings[binding_count++]; b->binding = binding; b->stride = e->stride; - b->inputRate = e->divisor ? VK_VERTEX_INPUT_RATE_INSTANCE : VK_VERTEX_INPUT_RATE_VERTEX; + b->inputRate = e->instanced ? VK_VERTEX_INPUT_RATE_INSTANCE : VK_VERTEX_INPUT_RATE_VERTEX; - if (e->divisor > 1) + if (e->instanced) { d = &key->divisors[divisor_count++]; d->binding = binding; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba86cb7ebdb..c15765af0e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1665,6 +1665,7 @@ struct wined3d_stream_info_element GLsizei stride; unsigned int stream_idx; unsigned int divisor; + bool instanced; }; struct wined3d_stream_info

1 0

Zebediah Figura : d3d10core/tests: Test multiple instanced step rates.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 05a0e9ee2dcb3ebef392da275a04a8ae8143d047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a0e9ee2dcb3ebef392da27… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 15:52:51 2021 -0500 d3d10core/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/d3d10core/tests/d3d10core.c | 117 ++++++++++++++++++++++++--------------- 1 file changed, 73 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05a0e9ee2dcb3ebef392…

1 0

Zebediah Figura : d3d11/tests: Test multiple instanced step rates.
by Alexandre Julliard 25 Mar '21

25 Mar '21

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

Henri Verbeet : wined3d: Handle a few more border colours for Vulkan samplers.
by Alexandre Julliard 25 Mar '21

25 Mar '21

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