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

Henri Verbeet : wined3d: Send blits through the command stream.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 87192548edc106510879ec5bfd1e5cd40f7c64fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=87192548edc106510879ec5bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 8 10:53:02 2017 +0100 wined3d: Send blits through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 69 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 11 ++++--- dlls/wined3d/wined3d_private.h | 4 +++ 3 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9f3de81..6de8dbd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -63,6 +63,7 @@ enum wined3d_cs_op WINED3D_CS_OP_UNLOAD_RESOURCE, WINED3D_CS_OP_MAP, WINED3D_CS_OP_UNMAP, + WINED3D_CS_OP_BLT_SUB_RESOURCE, WINED3D_CS_OP_UPDATE_SUB_RESOURCE, }; @@ -345,6 +346,20 @@ struct wined3d_cs_unmap HRESULT *hr; }; +struct wined3d_cs_blt_sub_resource +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *dst_resource; + unsigned int dst_sub_resource_idx; + struct wined3d_box dst_box; + struct wined3d_resource *src_resource; + unsigned int src_sub_resource_idx; + struct wined3d_box src_box; + DWORD flags; + struct wined3d_blt_fx fx; + enum wined3d_texture_filter_type filter; +}; + struct wined3d_cs_update_sub_resource { enum wined3d_cs_op opcode; @@ -1657,6 +1672,59 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc return hr; } +static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void *data) +{ + struct wined3d_surface *dst_surface, *src_surface = NULL; + const struct wined3d_cs_blt_sub_resource *op = data; + struct wined3d_texture *dst_texture, *src_texture; + RECT src_rect, dst_rect; + + dst_texture = texture_from_resource(op->dst_resource); + dst_surface = dst_texture->sub_resources[op->dst_sub_resource_idx].u.surface; + if (op->src_resource) + { + src_texture = texture_from_resource(op->src_resource); + src_surface = src_texture->sub_resources[op->src_sub_resource_idx].u.surface; + } + SetRect(&dst_rect, op->dst_box.left, op->dst_box.top, op->dst_box.right, op->dst_box.bottom); + SetRect(&src_rect, op->src_box.left, op->src_box.top, op->src_box.right, op->src_box.bottom); + + if (FAILED(wined3d_surface_blt(dst_surface, &dst_rect, src_surface, + &src_rect, op->flags, &op->fx, op->filter))) + FIXME("Blit failed.\n"); + + if (op->src_resource) + wined3d_resource_release(op->src_resource); + wined3d_resource_release(op->dst_resource); +} + +void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, + unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, + const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) +{ + struct wined3d_cs_blt_sub_resource *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_BLT_SUB_RESOURCE; + op->dst_resource = dst_resource; + op->dst_sub_resource_idx = dst_sub_resource_idx; + op->dst_box = *dst_box; + op->src_resource = src_resource; + op->src_sub_resource_idx = src_sub_resource_idx; + op->src_box = *src_box; + op->flags = flags; + if (fx) + op->fx = *fx; + op->filter = filter; + + wined3d_resource_acquire(dst_resource); + if (src_resource) + wined3d_resource_acquire(src_resource); + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_update_sub_resource *op = data; @@ -1775,6 +1843,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, /* WINED3D_CS_OP_MAP */ wined3d_cs_exec_map, /* WINED3D_CS_OP_UNMAP */ wined3d_cs_exec_unmap, + /* WINED3D_CS_OP_BLT_SUB_RESOURCE */ wined3d_cs_exec_blt_sub_resource, /* WINED3D_CS_OP_UPDATE_SUB_RESOURCE */ wined3d_cs_exec_update_sub_resource, }; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4dea254..2688735 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2629,7 +2629,6 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned { struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; - struct wined3d_texture_sub_resource *dst_resource, *src_resource = NULL; unsigned int dst_format_flags, src_format_flags = 0; HRESULT hr; @@ -2638,7 +2637,7 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned dst_texture, dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), src_texture, src_sub_resource_idx, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - if (!(dst_resource = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx)) + if (dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; @@ -2649,7 +2648,7 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned if (src_texture) { - if (!(src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx)) + if (src_sub_resource_idx >= src_texture->level_count * src_texture->layer_count || src_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; @@ -2680,8 +2679,10 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned return WINED3DERR_INVALIDCALL; } - return wined3d_surface_blt(dst_resource->u.surface, dst_rect, - src_resource ? src_resource->u.surface : NULL, src_rect, flags, fx, filter); + wined3d_cs_emit_blt_sub_resource(dst_texture->resource.device->cs, &dst_texture->resource, dst_sub_resource_idx, + &dst_box, src_texture ? &src_texture->resource : NULL, src_sub_resource_idx, &src_box, flags, fx, filter); + + return WINED3D_OK; } HRESULT CDECL wined3d_texture_get_overlay_position(const struct wined3d_texture *texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48f2f36..e8c858e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3212,6 +3212,10 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HID void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; +void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *dst_resource, + unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_resource *src_resource, + unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, + const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch(struct wined3d_cs *cs,

1 0

Henri Verbeet : wined3d: Send sub-resource copy calls through the command stream.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 95abd3c924c6486a26ccc647ad560f85f6281503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95abd3c924c6486a26ccc647a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 8 10:53:03 2017 +0100 wined3d: Send sub-resource copy calls through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 41 +++++++++++----- dlls/wined3d/device.c | 132 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 113 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95abd3c924c6486a26ccc…

1 0

Henri Verbeet : wined3d: Send resource copy calls through the command stream.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 0cdae5686464d07140cf2cfc63ee1b1100e7bc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cdae5686464d07140cf2cfc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 8 10:53:04 2017 +0100 wined3d: Send resource copy calls through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43a30c8..34421a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3819,9 +3819,8 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { struct wined3d_texture *dst_texture, *src_texture; - RECT dst_rect, src_rect; + struct wined3d_box box; unsigned int i, j; - HRESULT hr; TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource); @@ -3859,10 +3858,15 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, if (dst_resource->type == WINED3D_RTYPE_BUFFER) { - if (FAILED(hr = wined3d_buffer_copy(buffer_from_resource(dst_resource), 0, - buffer_from_resource(src_resource), 0, - dst_resource->size))) - ERR("Failed to copy buffer, hr %#x.\n", hr); + box.left = 0; + box.top = 0; + box.right = src_resource->size; + box.bottom = 1; + box.front = 0; + box.back = 1; + + wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &box, + src_resource, 0, &box, 0, NULL, WINED3D_TEXF_POINT); return; } @@ -3886,19 +3890,19 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, for (i = 0; i < dst_texture->level_count; ++i) { - SetRect(&dst_rect, 0, 0, - wined3d_texture_get_level_width(dst_texture, i), - wined3d_texture_get_level_height(dst_texture, i)); - SetRect(&src_rect, 0, 0, - wined3d_texture_get_level_width(src_texture, i), - wined3d_texture_get_level_height(dst_texture, i)); + box.left = 0; + box.top = 0; + box.right = wined3d_texture_get_level_width(dst_texture, i); + box.bottom = wined3d_texture_get_level_height(dst_texture, i); + box.front = 0; + box.back = wined3d_texture_get_level_depth(dst_texture, i); + for (j = 0; j < dst_texture->layer_count; ++j) { unsigned int idx = j * dst_texture->level_count + i; - if (FAILED(hr = wined3d_texture_blt(dst_texture, idx, &dst_rect, - src_texture, idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) - ERR("Failed to blit, sub-resource %u, hr %#x.\n", idx, hr); + wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &box, + src_resource, idx, &box, 0, NULL, WINED3D_TEXF_POINT); } } }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetShaderResources().
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 3fe9488812b995c7a9c55af4ce50f4a4a324319a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe9488812b995c7a9c55af4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:17 2017 +0100 d3d11: Implement d3d11_immediate_context_CSGetShaderResources(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 43e61c0..5ebe8ff 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1990,7 +1990,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_cs_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + ID3D11ShaderResourceView_AddRef(views[i] = &view_impl->ID3D11ShaderResourceView_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_cs_sampler().
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 5faccd82ba3bc66fbbc07c0533d87ca03890c7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5faccd82ba3bc66fbbc07c053… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:18 2017 +0100 wined3d: Introduce wined3d_device_get_cs_sampler(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 15 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea229f8..d8ac697 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2795,6 +2795,19 @@ void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device, wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx, sampler); } +struct wined3d_sampler * CDECL wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SAMPLER_OBJECTS) + { + WARN("Invalid sampler index %u.\n", idx); + return NULL; + } + + return device->state.sampler[WINED3D_SHADER_TYPE_COMPUTE][idx]; +} + static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_device *device, enum wined3d_pipeline pipeline, unsigned int idx, struct wined3d_unordered_access_view *uav) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 869fa35..817deca 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -55,6 +55,7 @@ @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_cs_cb(ptr long) @ cdecl wined3d_device_get_cs_resource_view(ptr long) +@ cdecl wined3d_device_get_cs_sampler(ptr long) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 482568f..0fcf07c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2168,6 +2168,7 @@ void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_view(const struct wined3d_device *device, unsigned int idx); +struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetSamplers().
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 1170a04a2bcff32c39d811304aa006ae9a6d19bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1170a04a2bcff32c39d811304… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:19 2017 +0100 d3d11: Implement d3d11_immediate_context_CSGetSamplers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5ebe8ff..336692e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2048,8 +2048,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_cs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + ID3D11SamplerState_AddRef(samplers[i] = &sampler_impl->ID3D11SamplerState_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_constant_buffer() helper function.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 9265d5515153bf7c7e02e2b2dd6537a44cd4c2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9265d5515153bf7c7e02e2b2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:20 2017 +0100 wined3d: Introduce wined3d_device_get_constant_buffer() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d8ac697..5cdf402 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2156,17 +2156,23 @@ void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, str wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx, buffer); } -struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) +static struct wined3d_buffer *wined3d_device_get_constant_buffer(const struct wined3d_device *device, + enum wined3d_shader_type shader_type, unsigned int idx) { - TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); return NULL; } - return device->state.cb[WINED3D_SHADER_TYPE_VERTEX][idx]; + return device->state.cb[shader_type][idx]; +} + +struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx); } static void wined3d_device_set_shader_resource_view(struct wined3d_device *device, @@ -2441,13 +2447,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return NULL; - } - - return device->state.cb[WINED3D_SHADER_TYPE_PIXEL][idx]; + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_PIXEL, idx); } void CDECL wined3d_device_set_ps_resource_view(struct wined3d_device *device, @@ -2670,13 +2670,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return NULL; - } - - return device->state.cb[WINED3D_SHADER_TYPE_GEOMETRY][idx]; + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); } void CDECL wined3d_device_set_gs_resource_view(struct wined3d_device *device, @@ -2756,13 +2750,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_cs_cb(const struct wined3d_devi { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return NULL; - } - - return device->state.cb[WINED3D_SHADER_TYPE_COMPUTE][idx]; + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_COMPUTE, idx); } void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_shader_resource_view() helper function.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 3b42d471644f73e30c4ca62844648548988eb9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b42d471644f73e30c4ca6284… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:21 2017 +0100 wined3d: Introduce wined3d_device_get_shader_resource_view() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5cdf402..d88a2ee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2207,18 +2207,24 @@ void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_VERTEX, idx, view); } -struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(const struct wined3d_device *device, - UINT idx) +static struct wined3d_shader_resource_view *wined3d_device_get_shader_resource_view( + const struct wined3d_device *device, enum wined3d_shader_type shader_type, unsigned int idx) { - TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SHADER_RESOURCE_VIEWS) { WARN("Invalid view index %u.\n", idx); return NULL; } - return device->state.shader_resource_view[WINED3D_SHADER_TYPE_VERTEX][idx]; + return device->state.shader_resource_view[shader_type][idx]; +} + +struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(const struct wined3d_device *device, + UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_VERTEX, idx); } static void wined3d_device_set_sampler(struct wined3d_device *device, @@ -2463,13 +2469,7 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_get_ps_resource_view( { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SHADER_RESOURCE_VIEWS) - { - WARN("Invalid view index %u.\n", idx); - return NULL; - } - - return device->state.shader_resource_view[WINED3D_SHADER_TYPE_PIXEL][idx]; + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_PIXEL, idx); } void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) @@ -2686,13 +2686,7 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_get_gs_resource_view( { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SHADER_RESOURCE_VIEWS) - { - WARN("Invalid view index %u.\n", idx); - return NULL; - } - - return device->state.shader_resource_view[WINED3D_SHADER_TYPE_GEOMETRY][idx]; + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); } void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) @@ -2766,13 +2760,7 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_get_cs_resource_view( { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SHADER_RESOURCE_VIEWS) - { - WARN("Invalid view index %u.\n", idx); - return NULL; - } - - return device->state.shader_resource_view[WINED3D_SHADER_TYPE_COMPUTE][idx]; + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_COMPUTE, idx); } void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_sampler() helper function.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 287c1851731070b5b6b2e2fe6f0ae9e48db7aff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287c1851731070b5b6b2e2fe6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:22 2017 +0100 wined3d: Introduce wined3d_device_get_sampler() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d88a2ee..cb68f3c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2258,17 +2258,23 @@ void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx, sampler); } -struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) +static struct wined3d_sampler *wined3d_device_get_sampler(const struct wined3d_device *device, + enum wined3d_shader_type shader_type, unsigned int idx) { - TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) { WARN("Invalid sampler index %u.\n", idx); return NULL; } - return device->state.sampler[WINED3D_SHADER_TYPE_VERTEX][idx]; + return device->state.sampler[shader_type][idx]; +} + +struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx); } HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, @@ -2483,13 +2489,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_PIXEL][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx); } HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, @@ -2700,13 +2700,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_GEOMETRY][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); } void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader) @@ -2775,13 +2769,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_cs_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_COMPUTE][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx); } static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_device *device,

1 0

Józef Kucia : wined3d: Make sure that "tgsm_count" is not decreased while adding TGSM declarations.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: d4443bdc2974d9933daf2a94a99231d14d8269e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4443bdc2974d9933daf2a94a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:23 2017 +0100 wined3d: Make sure that "tgsm_count" is not decreased while adding TGSM declarations. Suggested by Sebastian Lackner. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f867766..7186fdf 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -884,7 +884,7 @@ static HRESULT shader_reg_maps_add_tgsm(struct wined3d_shader_reg_maps *reg_maps register_idx + 1, sizeof(*reg_maps->tgsm))) return E_OUTOFMEMORY; - reg_maps->tgsm_count = register_idx + 1; + reg_maps->tgsm_count = max(register_idx + 1, reg_maps->tgsm_count); tgsm = &reg_maps->tgsm[register_idx]; tgsm->size = size; tgsm->stride = stride;

1 0