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

Alex Henrie : ole32: Fix sizeof mismatch in CompositeMonikerImpl_Construct.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 0bac055b5662b31f72b7f5bc665ef85ad97aff56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bac055b5662b31f72b7f5bc6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 29 18:31:15 2016 -0600 ole32: Fix sizeof mismatch in CompositeMonikerImpl_Construct. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index e431bfc..e1e0e5c 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1803,7 +1803,7 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike LPVOID tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; - This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); + This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ HeapFree(GetProcessHeap(), 0, tab_moniker);

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 860.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 6e1f687e4decfaa79def6a42db13f13566035b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1f687e4decfaa79def6a42d… Author: Caron Wills <caron(a)codeweavers.com> Date: Tue Mar 29 17:38:28 2016 +0000 wined3d: Add Nvidia GeForce GTX 860. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 980a92d..57ba641 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1283,6 +1283,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1745,6 +1746,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8182ca..9a7dff4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1742,6 +1742,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Nikolay Sivov : d2d1: Move bitmap creation helpers to common location.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: c1ea9df0a04bb6c5f48ea5f783f0f9b0bed47185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ea9df0a04bb6c5f48ea5f78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 21:30:38 2016 +0300 d2d1: Move bitmap creation helpers to common location. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 127 +++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/d2d1_private.h | 10 ++-- dlls/d2d1/render_target.c | 132 ++++------------------------------------------ 3 files changed, 137 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1ea9df0a04bb6c5f48ea…

1 0

Józef Kucia : d3d11: Implement private data methods for immediate ID3D11DeviceContext.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 88c5ddaae79a2965dcc9b33c69d7387d623e3e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c5ddaae79a2965dcc9b33c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:51 2016 +0200 d3d11: Implement private data methods for immediate ID3D11DeviceContext. 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/d3d11_private.h | 2 ++ dlls/d3d11/device.c | 34 +++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 80a16f3..655bae5 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -385,6 +385,8 @@ struct d3d11_immediate_context { ID3D11DeviceContext ID3D11DeviceContext_iface; LONG refcount; + + struct wined3d_private_store private_store; }; /* ID3D11Device, ID3D10Device1 */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5498c8b..e1bfb70 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -109,25 +109,31 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceCont static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetPrivateData(ID3D11DeviceContext *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&context->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateData(ID3D11DeviceContext *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&context->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateDataInterface(ID3D11DeviceContext *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&context->private_store, guid, data); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D11DeviceContext *iface, @@ -1919,14 +1925,19 @@ static const struct ID3D11DeviceContextVtbl d3d11_immediate_context_vtbl = d3d11_immediate_context_FinishCommandList, }; -static HRESULT d3d11_immediate_context_init(struct d3d11_immediate_context *context, struct d3d_device *device) +static void d3d11_immediate_context_init(struct d3d11_immediate_context *context, struct d3d_device *device) { context->ID3D11DeviceContext_iface.lpVtbl = &d3d11_immediate_context_vtbl; context->refcount = 1; ID3D11Device_AddRef(&device->ID3D11Device_iface); - return S_OK; + wined3d_private_store_init(&context->private_store); +} + +static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *context) +{ + wined3d_private_store_cleanup(&context->private_store); } /* ID3D11Device methods */ @@ -2777,6 +2788,7 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) if (!refcount) { + d3d11_immediate_context_destroy(&device->immediate_context); if (device->wined3d_device) { wined3d_mutex_lock(); @@ -5110,11 +5122,7 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) /* COM aggregation always takes place */ device->outer_unk = outer_unknown; - if (FAILED(d3d11_immediate_context_init(&device->immediate_context, device))) - { - WARN("Failed to initialize immediate device context.\n"); - return E_FAIL; - } + d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext_Release(&device->immediate_context.ID3D11DeviceContext_iface); if (wine_rb_init(&device->blend_states, &d3d_blend_state_rb_ops) == -1)

1 0

Józef Kucia : d3d11: Add ID3D11HullShader interface stub.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 210b78258f703edccfbeb0748587c5da6bd22a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=210b78258f703edccfbeb0748… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:52 2016 +0200 d3d11: Add ID3D11HullShader interface stub. 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/d3d11_private.h | 13 +++++ dlls/d3d11/device.c | 16 +++++- dlls/d3d11/shader.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 655bae5..e743598 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -250,6 +250,19 @@ HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_cod struct d3d_vertex_shader *unsafe_impl_from_ID3D11VertexShader(ID3D11VertexShader *iface) DECLSPEC_HIDDEN; struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; +/* ID3D11HullShader */ +struct d3d11_hull_shader +{ + ID3D11HullShader ID3D11HullShader_iface; + LONG refcount; + + struct wined3d_private_store private_store; + ID3D11Device *device; +}; + +HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_hull_shader **shader) DECLSPEC_HIDDEN; + /* ID3D11GeometryShader, ID3D10GeometryShader */ struct d3d_geometry_shader { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e1bfb70..deafdf1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2178,10 +2178,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreatePixelShader(ID3D11Device *if static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11HullShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d11_hull_shader *object; + HRESULT hr; + + FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p partial-stub!\n", iface, byte_code, byte_code_length, class_linkage, shader); - return E_NOTIMPL; + if (class_linkage) + FIXME("Class linkage is not implemented yet.\n"); + + if (FAILED(hr = d3d11_hull_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11HullShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *iface, const void *byte_code, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 06e4b8c..0659e2a 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -471,6 +471,134 @@ struct d3d_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader return impl_from_ID3D10VertexShader(iface); } +/* ID3D11HullShader methods */ + +static inline struct d3d11_hull_shader *impl_from_ID3D11HullShader(ID3D11HullShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_hull_shader, ID3D11HullShader_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_hull_shader_QueryInterface(ID3D11HullShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11HullShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11HullShader_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); + + TRACE("%p increasing refcount to %u.\n", shader, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); + + TRACE("%p decreasing refcount to %u.\n", shader, refcount); + + if (!refcount) + { + ID3D11Device_Release(shader->device); + HeapFree(GetProcessHeap(), 0, shader); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_hull_shader_GetDevice(ID3D11HullShader *iface, + ID3D11Device **device) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = shader->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_hull_shader_GetPrivateData(ID3D11HullShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_hull_shader_SetPrivateData(ID3D11HullShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_hull_shader_SetPrivateDataInterface(ID3D11HullShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_hull_shader *shader = impl_from_ID3D11HullShader(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&shader->private_store, guid, data); +} + +static const struct ID3D11HullShaderVtbl d3d11_hull_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_hull_shader_QueryInterface, + d3d11_hull_shader_AddRef, + d3d11_hull_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_hull_shader_GetDevice, + d3d11_hull_shader_GetPrivateData, + d3d11_hull_shader_SetPrivateData, + d3d11_hull_shader_SetPrivateDataInterface, +}; + +HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_hull_shader **shader) +{ + struct d3d11_hull_shader *object; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3D11HullShader_iface.lpVtbl = &d3d11_hull_shader_vtbl; + object->refcount = 1; + wined3d_private_store_init(&object->private_store); + + object->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(object->device); + + TRACE("Created hull shader %p.\n", object); + *shader = object; + + return S_OK; +} + /* ID3D11GeometryShader methods */ static inline struct d3d_geometry_shader *impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface)

1 0

Józef Kucia : wined3d: Add hull shader type.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 403459fd914788f180ad9eea6459274ac62f8c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=403459fd914788f180ad9eea6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:53 2016 +0200 wined3d: Add hull shader type. 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/arb_program_shader.c | 10 ++++++---- dlls/wined3d/context.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 8 +++++++- dlls/wined3d/shader.c | 19 ++++++++++++++++++- dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 12 ++++++++---- 8 files changed, 47 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=403459fd914788f180ad9…

1 0

Józef Kucia : wined3d: Introduce wined3d_shader_create_hs().
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: afa74b5c0f1c3aeda4e529ea3b59282a834628a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa74b5c0f1c3aeda4e529ea3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:54 2016 +0200 wined3d: Introduce wined3d_shader_create_hs(). 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 2 +- dlls/d3d11/shader.c | 84 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/shader.c | 41 ++++++++++++++++++++- dlls/wined3d/shader_sm4.c | 10 +++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 + 8 files changed, 129 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afa74b5c0f1c3aeda4e52…

1 0

Józef Kucia : wined3d: Recognize SM5 hs_decls opcode.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: ba0041a938d8eaf697b28407ad5f471276547657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0041a938d8eaf697b28407a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:55 2016 +0200 wined3d: Recognize SM5 hs_decls opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c32d64d..1dcb23f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5273,6 +5273,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GE */ NULL, + /* WINED3DSIH_HS_DECLS */ NULL, /* WINED3DSIH_IADD */ NULL, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2fdcd9e..6f5f70b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8167,6 +8167,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GE */ shader_glsl_relop, + /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ shader_glsl_relop, /* WINED3DSIH_IF */ shader_glsl_if, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4baa72a..f617bcd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -99,6 +99,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GE */ "ge", + /* WINED3DSIH_HS_DECLS */ "hs_decls", /* WINED3DSIH_IADD */ "iadd", /* WINED3DSIH_IEQ */ "ieq", /* WINED3DSIH_IF */ "if", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5c5a2a4..502de7c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -184,6 +184,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + WINED3D_SM5_OP_HS_DECLS = 0x71, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, @@ -396,6 +397,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_SIV, "", ""}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, + {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7bb4e09..daa52ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -555,6 +555,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FTOI, WINED3DSIH_FTOU, WINED3DSIH_GE, + WINED3DSIH_HS_DECLS, WINED3DSIH_IADD, WINED3DSIH_IEQ, WINED3DSIH_IF,

1 0

Józef Kucia : wined3d: Recognize SM5 hs_fork_phase opcode.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 87bef12eed127869c2300daf31ca6fec5c3a8448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bef12eed127869c2300daf3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:56 2016 +0200 wined3d: Recognize SM5 hs_fork_phase opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1dcb23f..379c1f7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5274,6 +5274,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, + /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_IADD */ NULL, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f5f70b..89249f4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8168,6 +8168,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, + /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ shader_glsl_relop, /* WINED3DSIH_IF */ shader_glsl_if, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f617bcd..3e76592 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -100,6 +100,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_DECLS */ "hs_decls", + /* WINED3DSIH_HS_FORK_PHASE */ "hs_fork_phase", /* WINED3DSIH_IADD */ "iadd", /* WINED3DSIH_IEQ */ "ieq", /* WINED3DSIH_IF */ "if", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 502de7c..e00ea9b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -185,6 +185,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM5_OP_HS_DECLS = 0x71, + WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, @@ -398,6 +399,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, + {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index daa52ab..3c3e27c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -556,6 +556,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FTOU, WINED3DSIH_GE, WINED3DSIH_HS_DECLS, + WINED3DSIH_HS_FORK_PHASE, WINED3DSIH_IADD, WINED3DSIH_IEQ, WINED3DSIH_IF,

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_input_control_point_count opcode.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: cee0c36444ef9c9e8be6c51821ad73e2a269b677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee0c36444ef9c9e8be6c5182… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:57 2016 +0200 wined3d: Recognize SM5 dcl_input_control_point_count opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 4 +++- dlls/wined3d/shader_sm4.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 379c1f7..8fd90cf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5232,6 +5232,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, + /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, /* WINED3DSIH_DCL_INPUT_PS */ NULL, /* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89249f4..382a9ca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8126,6 +8126,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, + /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PS */ NULL, /* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3e76592..1bb587f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -58,6 +58,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", /* WINED3DSIH_DCL_INPUT */ "dcl_input", + /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", /* WINED3DSIH_DCL_INPUT_PS */ "dcl_input_ps", /* WINED3DSIH_DCL_INPUT_PS_SGV */ "dcl_input_ps_sgv", @@ -2061,7 +2062,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, ", comparisonMode"); } else if (ins.handler_idx == WINED3DSIH_DCL_TEMPS - || ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) + || ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT + || ins.handler_idx == WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT) { shader_addline(&buffer, "%s %u", shader_opcode_names[ins.handler_idx], ins.declaration.count); } diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e00ea9b..a19fd21 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -61,6 +61,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_GLOBAL_FLAGS_SHIFT 11 #define WINED3D_SM4_GLOBAL_FLAGS_MASK (0xffu << WINED3D_SM4_GLOBAL_FLAGS_SHIFT) +#define WINED3D_SM5_CPOINT_COUNT_SHIFT 11 +#define WINED3D_SM5_CPOINT_COUNT_MASK (0xffu << WINED3D_SM5_CPOINT_COUNT_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (0x1u << 31) @@ -190,6 +193,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, + WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -404,6 +408,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, + {WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "", "Uif"}, @@ -1022,6 +1027,10 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->declaration.primitive_type = output_primitive_type_table[primitive_type]; } } + else if (opcode == WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT) + { + ins->declaration.count = (opcode_token & WINED3D_SM5_CPOINT_COUNT_MASK) >> WINED3D_SM5_CPOINT_COUNT_SHIFT; + } else if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) { enum wined3d_sm4_input_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c3e27c..5c58b80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT, + WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PS, WINED3DSIH_DCL_INPUT_PS_SGV,

1 0