April 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Implement d3d11_device_CreateDomainShader().
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 37416f228239b6afa0e6f279566e62e9f10ae83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=37416f228239b6afa0e6f2795… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 1 11:21:42 2016 +0200 d3d11: Implement d3d11_device_CreateDomainShader(). 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 | 14 ++++ dlls/d3d11/device.c | 16 +++- dlls/d3d11/shader.c | 196 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 224 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b4614c0..17e9f9f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -264,6 +264,20 @@ struct d3d11_hull_shader 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; +/* ID3D11DomainShader */ +struct d3d11_domain_shader +{ + ID3D11DomainShader ID3D11DomainShader_iface; + LONG refcount; + + struct wined3d_private_store private_store; + struct wined3d_shader *wined3d_shader; + ID3D11Device *device; +}; + +HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_domain_shader **shader) DECLSPEC_HIDDEN; + /* ID3D11GeometryShader, ID3D10GeometryShader */ struct d3d_geometry_shader { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8a53e89..4e84dad 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2199,10 +2199,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateHullShader(ID3D11Device *ifa static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11DomainShader **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_domain_shader *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\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_domain_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11DomainShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device *iface, const void *byte_code, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index a91bec7..bf6bb32 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -667,6 +667,202 @@ HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_cod return S_OK; } +/* ID3D11DomainShader methods */ + +static inline struct d3d11_domain_shader *impl_from_ID3D11DomainShader(ID3D11DomainShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_domain_shader, ID3D11DomainShader_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_domain_shader_QueryInterface(ID3D11DomainShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11DomainShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11DomainShader_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_domain_shader_AddRef(ID3D11DomainShader *iface) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); + + TRACE("%p increasing refcount to %u.\n", shader, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *iface) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); + + TRACE("%p decreasing refcount to %u.\n", shader, refcount); + + if (!refcount) + { + ID3D11Device *device = shader->device; + + wined3d_mutex_lock(); + wined3d_shader_decref(shader->wined3d_shader); + wined3d_mutex_unlock(); + + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D11Device_Release(device); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_domain_shader_GetDevice(ID3D11DomainShader *iface, + ID3D11Device **device) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = shader->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_domain_shader_GetPrivateData(ID3D11DomainShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(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_domain_shader_SetPrivateData(ID3D11DomainShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(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_domain_shader_SetPrivateDataInterface(ID3D11DomainShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_domain_shader *shader = impl_from_ID3D11DomainShader(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 ID3D11DomainShaderVtbl d3d11_domain_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_domain_shader_QueryInterface, + d3d11_domain_shader_AddRef, + d3d11_domain_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_domain_shader_GetDevice, + d3d11_domain_shader_GetPrivateData, + d3d11_domain_shader_SetPrivateData, + d3d11_domain_shader_SetPrivateDataInterface, +}; + +static void STDMETHODCALLTYPE d3d11_domain_shader_wined3d_object_destroyed(void *parent) +{ + struct d3d11_domain_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d11_domain_shader_wined3d_parent_ops = +{ + d3d11_domain_shader_wined3d_object_destroyed, +}; + +static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, struct d3d_device *device, + const void *byte_code, SIZE_T byte_code_length) +{ + struct wined3d_shader_signature output_signature; + struct wined3d_shader_signature input_signature; + struct d3d_shader_info shader_info; + struct wined3d_shader_desc desc; + HRESULT hr; + + shader->ID3D11DomainShader_iface.lpVtbl = &d3d11_domain_shader_vtbl; + shader->refcount = 1; + wined3d_mutex_lock(); + wined3d_private_store_init(&shader->private_store); + + shader_info.input_signature = &input_signature; + shader_info.output_signature = &output_signature; + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) + { + WARN("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); + wined3d_mutex_unlock(); + return hr; + } + + desc.byte_code = shader_info.shader_code; + desc.input_signature = &input_signature; + desc.output_signature = &output_signature; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); + + hr = wined3d_shader_create_ds(device->wined3d_device, &desc, shader, + &d3d11_domain_shader_wined3d_parent_ops, &shader->wined3d_shader); + shader_free_signature(&input_signature); + shader_free_signature(&output_signature); + if (FAILED(hr)) + { + WARN("Failed to create wined3d domain shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); + wined3d_mutex_unlock(); + return E_INVALIDARG; + } + wined3d_mutex_unlock(); + + shader->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(shader->device); + + return S_OK; +} + +HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_domain_shader **shader) +{ + struct d3d11_domain_shader *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d11_domain_shader_init(object, device, byte_code, byte_code_length))) + { + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created domain shader %p.\n", object); + *shader = object; + + return S_OK; +} + /* ID3D11GeometryShader methods */ static inline struct d3d_geometry_shader *impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface)

1 0

Alistair Leslie-Hughes : d3d10: Add D3D10CreateEffectPoolFromMemory stub.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: e7003fd28a81a7ba5907a904f82bed389e26a418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7003fd28a81a7ba5907a904f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 1 17:44:53 2016 +1100 d3d10: Add D3D10CreateEffectPoolFromMemory stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 8 ++++++++ dlls/d3d10_1/d3d10_1.spec | 2 +- include/d3d10effect.h | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 1e6eb36..db42511 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -4,7 +4,7 @@ @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) -@ stub D3D10CreateEffectPoolFromMemory +@ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr) @ stdcall D3D10CreateStateBlock(ptr ptr ptr) @ stub D3D10DisassembleEffect @ stdcall D3D10DisassembleShader(ptr long long ptr ptr) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index e36ec51..0f2af09 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -252,6 +252,14 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const return E_NOTIMPL; } +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, + ID3D10Device *device, ID3D10EffectPool **effect_pool) +{ + FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", + data, data_size, fx_flags, device, effect_pool); + + return E_NOTIMPL; +} const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 5582558..18eb3ac 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -5,7 +5,7 @@ @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain1(ptr long ptr long long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory -@ stub D3D10CreateEffectPoolFromMemory +@ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr) d3d10.D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock @ stub D3D10DisassembleEffect @ stub D3D10DisassembleShader diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 1494894..b4a33da 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -832,6 +832,8 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const ID3D10Blob **effect, ID3D10Blob **errors); HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, + ID3D10Device *device, ID3D10EffectPool **effect_pool); HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, D3D10_STATE_BLOCK_MASK *mask, ID3D10StateBlock **stateblock);

1 0

Nikolay Sivov : dwrite: Always initialize context and font table pointers.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 7cac7bb99f962e268796fe5f7566d0eaffd09bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cac7bb99f962e268796fe5f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 1 08:40:07 2016 +0300 dwrite: Always initialize context and font table pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 +++ dlls/dwrite/tests/font.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7fb1749..97a786d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -967,6 +967,9 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ if (found) *found = FALSE; if (table_size) *table_size = 0; + *table_data = NULL; + *table_context = NULL; + if (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { const TTC_Header_V1 *ttc_header; void * ttc_context; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9ba8b6d..ec631bd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2923,6 +2923,15 @@ static void test_TryGetFontTable(void) IDWriteFontFace_ReleaseFontTable(fontface, context2); IDWriteFontFace_ReleaseFontTable(fontface, context); + /* table does not exist */ + exists = TRUE; + context = (void*)0xdeadbeef; + table = (void*)0xdeadbeef; + hr = IDWriteFontFace_TryGetFontTable(fontface, 0xabababab, &table, &size, &context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == FALSE, "got %d\n", exists); + ok(context == NULL && table == NULL, "got context %p, table pointer %p\n", context, table); + IDWriteFontFace_Release(fontface); IDWriteFontFile_Release(file); IDWriteFactory_Release(factory);

1 0

Matteo Bruni : wined3d: Don't read texcoord attributes unless necessary.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 6654af1017ab15e825fc7e1959ae47f20af8478f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6654af1017ab15e825fc7e195… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 31 19:50:59 2016 +0200 wined3d: Don't read texcoord attributes unless necessary. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3127b75..dbb0956 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6149,10 +6149,9 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr for (i = 0; i < MAX_TEXTURES; ++i) { unsigned int coord_idx = settings->texgen[i] & 0x0000ffff; - if ((settings->texgen[i] & 0xffff0000) == WINED3DTSS_TCI_PASSTHRU) - { + if ((settings->texgen[i] & 0xffff0000) == WINED3DTSS_TCI_PASSTHRU + && settings->texcoords & (1u << i)) shader_addline(buffer, "vec4 ffp_attrib_texcoord%u = vs_in%u;\n", i, coord_idx + WINED3D_FFP_TEXCOORD0); - } } shader_addline(buffer, "ffp_attrib_blendweight[%u] = 1.0;\n", settings->vertexblends);

1 0

Matteo Bruni : wined3d: Avoid the deprecated GLSL "attribute" keyword on core profile contexts.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 0526544576cfc02faee230f989ebe81862f4dc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0526544576cfc02faee230f98… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 31 19:50:57 2016 +0200 wined3d: Avoid the deprecated GLSL "attribute" keyword on core profile contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3041eef..75c9109 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1574,6 +1574,11 @@ static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info) return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; } +static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info) +{ + return needs_legacy_glsl_syntax(gl_info) ? "attribute" : "in"; +} + static void PRINTF_ATTR(4, 5) declare_in_varying(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, BOOL flat, const char *format, ...) { @@ -1902,7 +1907,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", prefix, e->register_idx); else - shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, e->register_idx); + shader_addline(buffer, "%s vec4 %s_in%u;\n", + get_attribute_keyword(gl_info), prefix, e->register_idx); } if (vs_args->point_size && !vs_args->per_vertex_point_size) @@ -6059,7 +6065,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr { const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4"; - shader_addline(buffer, "attribute %s vs_in%u;\n", type, i); + shader_addline(buffer, "%s %s vs_in%u;\n", get_attribute_keyword(gl_info), type, i); } shader_addline(buffer, "\n");

1 0

Matteo Bruni : ddraw/tests: Add a test for color varyings clamping.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 302b610f9c07ce30c35788476dad3547d383a113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302b610f9c07ce30c35788476… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 31 19:50:56 2016 +0200 ddraw/tests: Add a test for color varyings clamping. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 101 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 92 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 192 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=302b610f9c07ce30c3578…

1 0

Nikolay Sivov : d2d1: Move brush creation helpers to common location.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 27d5d4caf2d694ef0ed281c9e48905e7aae0fdf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d5d4caf2d694ef0ed281c9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 31 14:49:31 2016 +0300 d2d1: Move brush 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/brush.c | 78 +++++++++++++++++++++++++++++++---------------- dlls/d2d1/d2d1_private.h | 21 ++++++------- dlls/d2d1/render_target.c | 53 ++++++++++---------------------- 3 files changed, 77 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27d5d4caf2d694ef0ed28…

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in swapchain_gl_present().
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: c633ffb95caaf6e05299bb32a64c517621d5a6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c633ffb95caaf6e05299bb32a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:52 2016 +0200 wined3d: Avoid surface_from_resource() in swapchain_gl_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f1b8b54..84717d1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -480,8 +480,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags) { - struct wined3d_surface *back_buffer = surface_from_resource( - wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); + struct wined3d_surface *back_buffer = swapchain->back_buffers[0]->sub_resources[0].u.surface; const struct wined3d_fb_state *fb = &swapchain->device->fb; const struct wined3d_gl_info *gl_info; struct wined3d_texture *logo_texture;

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_device_update_texture().
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: cf8ccb865dc1677df5599daaf238bd8c19630eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8ccb865dc1677df5599daaf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:51 2016 +0200 wined3d: Avoid surface_from_resource() in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d81bb70..35bf521 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3666,10 +3666,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, { for (j = 0; j < level_count; ++j) { - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, - i * src_levels + j + src_skip_levels)); - dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, - i * dst_levels + j)); + src_surface = src_texture->sub_resources[i * src_levels + j + src_skip_levels].u.surface; + dst_surface = dst_texture->sub_resources[i * dst_levels + j].u.surface; if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL))) { WARN("Failed to update surface, hr %#x.\n", hr);

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_tessellator_output_primitive opcode.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 90dcb4db72fed08d1f521ce8eb31c09c4ed79fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90dcb4db72fed08d1f521ce8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 1 11:21:38 2016 +0200 wined3d: Recognize SM5 dcl_tessellator_output_primitive 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 | 29 +++++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 5 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1cb4d20..33746af 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5249,6 +5249,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_SAMPLER */ NULL, /* WINED3DSIH_DCL_TEMPS */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, + /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ce1b1f4..89f5b5e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8163,6 +8163,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, + /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ec45dd8..4e1a617 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -75,6 +75,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_SAMPLER */ "dcl_sampler", /* WINED3DSIH_DCL_TEMPS */ "dcl_temps", /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ "dcl_tessellator_domain", + /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -1318,6 +1319,29 @@ static void shader_dump_tessellator_domain(struct wined3d_string_buffer *buffer, } } +static void shader_dump_tessellator_output_primitive(struct wined3d_string_buffer *buffer, + enum wined3d_tessellator_output_primitive output_primitive) +{ + switch (output_primitive) + { + case WINED3D_TESSELLATOR_OUTPUT_POINT: + shader_addline(buffer, "point"); + break; + case WINED3D_TESSELLATOR_OUTPUT_LINE: + shader_addline(buffer, "line"); + break; + case WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CW: + shader_addline(buffer, "triangle_cw"); + break; + case WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW: + shader_addline(buffer, "triangle_ccw"); + break; + default: + shader_addline(buffer, "unknown_tessellator_output_primitive(%#x)", output_primitive); + break; + } +} + static void shader_dump_sysval_semantic(struct wined3d_string_buffer *buffer, enum wined3d_sysval_semantic semantic) { unsigned int i; @@ -2119,6 +2143,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); shader_dump_tessellator_domain(&buffer, ins.declaration.tessellator_domain); } + else if (ins.handler_idx == WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_tessellator_output_primitive(&buffer, ins.declaration.tessellator_output_primitive); + } else if (ins.handler_idx == WINED3DSIH_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 936b84b..515061b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -64,8 +64,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) -#define WINED3D_SM5_TESSELLATOR_DOMAIN_SHIFT 11 -#define WINED3D_SM5_TESSELLATOR_DOMAIN_MASK (0xfu << WINED3D_SM5_TESSELLATOR_DOMAIN_SHIFT) +#define WINED3D_SM5_TESSELLATOR_SHIFT 11 +#define WINED3D_SM5_TESSELLATOR_MASK (0xfu << WINED3D_SM5_TESSELLATOR_SHIFT) #define WINED3D_SM4_OPCODE_MASK 0xff @@ -199,6 +199,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN = 0x95, + WINED3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE = 0x97, WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, @@ -419,6 +420,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_DOMAIN, "", ""}, + {WINED3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, "", ""}, {WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, "", ""}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, @@ -1046,8 +1048,13 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } else if (opcode == WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN) { - ins->declaration.tessellator_domain = (opcode_token & WINED3D_SM5_TESSELLATOR_DOMAIN_MASK) - >> WINED3D_SM5_TESSELLATOR_DOMAIN_SHIFT; + ins->declaration.tessellator_domain = (opcode_token & WINED3D_SM5_TESSELLATOR_MASK) + >> WINED3D_SM5_TESSELLATOR_SHIFT; + } + else if (opcode == WINED3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE) + { + ins->declaration.tessellator_output_primitive = (opcode_token & WINED3D_SM5_TESSELLATOR_MASK) + >> WINED3D_SM5_TESSELLATOR_SHIFT; } else if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f3f18e..0bcc82d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -446,6 +446,14 @@ enum wined3d_tessellator_domain WINED3D_TESSELLATOR_DOMAIN_QUAD = 3, }; +enum wined3d_tessellator_output_primitive +{ + WINED3D_TESSELLATOR_OUTPUT_POINT = 1, + WINED3D_TESSELLATOR_OUTPUT_LINE = 2, + WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CW = 3, + WINED3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW = 4, +}; + /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ #define WINED3DSI_TEXLD_PROJECT 0x1 #define WINED3DSI_TEXLD_BIAS 0x2 @@ -539,6 +547,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_SAMPLER, WINED3DSIH_DCL_TEMPS, WINED3DSIH_DCL_TESSELLATOR_DOMAIN, + WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, @@ -866,6 +875,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; enum wined3d_tessellator_domain tessellator_domain; + enum wined3d_tessellator_output_primitive tessellator_output_primitive; float max_tessellation_factor; } declaration; };

1 0