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

Matteo Bruni : wined3d: Reselect the current GLSL geometry shader when possible even if the VS changed.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 54d8f57cc58e5d0d9b962559fe2f7bc071144637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d8f57cc58e5d0d9b962559f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:59 2016 +0200 wined3d: Reselect the current GLSL geometry shader when possible even if the VS changed. 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, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 324b606..d3a0ebf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7447,7 +7447,9 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program->gs.id) + { gs_id = ctx_data->glsl_program->gs.id; + } else if (gshader) { struct gs_compile_args args; @@ -7462,12 +7464,18 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct vs_compile_args vs_compile_args; vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, d3d_info); vs_id = find_glsl_vshader(context, priv, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; - if ((gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) + if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) + && ctx_data->glsl_program->gs.id) + { + gs_id = ctx_data->glsl_program->gs.id; + } + else if (gshader) { struct gs_compile_args gs_compile_args;

1 0

Aaryaman Vasishta : d3drm: Keep a reference to IDirect3DRM in d3drm_texture.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: bebe679d51817f429755cd194d9ebec13fac761a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebe679d51817f429755cd194… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat May 21 02:55:38 2016 +0530 d3drm: Keep a reference to IDirect3DRM in d3drm_texture. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 29 ++++++++++++++++++----------- dlls/d3drm/d3drm_private.h | 3 ++- dlls/d3drm/meshbuilder.c | 2 +- dlls/d3drm/texture.c | 3 ++- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index edb46df..4376aa6 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -200,7 +200,7 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, iface))) return hr; *texture = &object->IDirect3DRMTexture_iface; @@ -418,7 +418,7 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, iface))) return hr; *texture = &object->IDirect3DRMTexture_iface; @@ -434,7 +434,7 @@ static HRESULT WINAPI d3drm1_LoadTextureFromResource(IDirect3DRM *iface, FIXME("iface %p, resource %p, texture %p stub!\n", iface, resource, texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, iface))) return hr; *texture = &object->IDirect3DRMTexture_iface; @@ -661,12 +661,13 @@ static HRESULT WINAPI d3drm2_CreateAnimationSet(IDirect3DRM2 *iface, IDirect3DRM static HRESULT WINAPI d3drm2_CreateTexture(IDirect3DRM2 *iface, D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture2_iface; @@ -857,29 +858,31 @@ static HRESULT WINAPI d3drm2_CreateUserVisual(IDirect3DRM2 *iface, static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, const char *filename, IDirect3DRMTexture2 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture2_iface; - return D3DRM_OK; + return hr; } static HRESULT WINAPI d3drm2_LoadTextureFromResource(IDirect3DRM2 *iface, HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, resource_name %s, resource_type %s, texture %p stub!\n", iface, debugstr_a(resource_name), debugstr_a(resource_type), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture2_iface; @@ -1058,6 +1061,7 @@ static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); IUnknown *object; HRESULT hr; @@ -1083,7 +1087,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, if (IsEqualGUID(clsid, &CLSID_CDirect3DRMTexture)) { struct d3drm_texture *texture; - if (FAILED(hr = d3drm_texture_create(&texture))) + if (FAILED(hr = d3drm_texture_create(&texture, &d3drm->IDirect3DRM_iface))) { *out = NULL; return hr; @@ -1150,12 +1154,13 @@ static HRESULT WINAPI d3drm3_CreateAnimationSet(IDirect3DRM3 *iface, IDirect3DRM static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture3_iface; @@ -1396,12 +1401,13 @@ static HRESULT WINAPI d3drm3_CreateUserVisual(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, const char *filename, IDirect3DRMTexture3 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture3_iface; @@ -1412,13 +1418,14 @@ static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_LoadTextureFromResource(IDirect3DRM3 *iface, HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture3 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, module %p, resource_name %s, resource_type %s, texture %p stub!\n", iface, module, debugstr_a(resource_name), debugstr_a(resource_type), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture3_iface; diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 2eb8e4d..21c46b7 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -40,6 +40,7 @@ struct d3drm_texture IDirect3DRMTexture IDirect3DRMTexture_iface; IDirect3DRMTexture2 IDirect3DRMTexture2_iface; IDirect3DRMTexture3 IDirect3DRMTexture3_iface; + IDirect3DRM *d3drm; }; void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; @@ -48,7 +49,7 @@ HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMO void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) DECLSPEC_HIDDEN; HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; -HRESULT d3drm_texture_create(struct d3drm_texture **texture) DECLSPEC_HIDDEN; +HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 57429a5..72c4473 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1300,7 +1300,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (file != INVALID_HANDLE_VALUE) { CloseHandle(file); - if (FAILED(hr = d3drm_texture_create(&texture_object))) + if (FAILED(hr = d3drm_texture_create(&texture_object, NULL))) { IDirectXFileData_Release(data); goto end; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 886bb0b..5596bf5 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -1044,7 +1044,7 @@ static const struct IDirect3DRMTexture3Vtbl d3drm_texture3_vtbl = d3drm_texture3_SetValidationCallback, }; -HRESULT d3drm_texture_create(struct d3drm_texture **texture) +HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) { struct d3drm_texture *object; @@ -1056,6 +1056,7 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture) object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl; object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; + object->d3drm = d3drm; d3drm_object_init(&object->obj);

1 0

Aaryaman Vasishta : d3drm: Introduce d3drm_texture_destroy helper.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 07c038c2b4c250f5aef042a7955f32cf9293e44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c038c2b4c250f5aef042a79… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat May 21 02:55:39 2016 +0530 d3drm: Introduce d3drm_texture_destroy helper. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/texture.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 5596bf5..eb8dfe0 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -44,6 +44,14 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); } +static void d3drm_texture_destroy(struct d3drm_texture *texture) +{ + TRACE("texture %p is being destroyed.\n", texture); + + d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); + HeapFree(GetProcessHeap(), 0, texture); +} + static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); @@ -722,10 +730,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - { - d3drm_object_cleanup((IDirect3DRMObject*)iface, &texture->obj); - HeapFree(GetProcessHeap(), 0, texture); - } + d3drm_texture_destroy(texture); return refcount; }

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 9511d09852d2a0187c34017889b1882f88e42d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9511d09852d2a0187c3401788… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat May 21 02:55:40 2016 +0530 d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 123 ++++++++++++++++++++++++++++++++++++++------- dlls/d3drm/texture.c | 40 +++++++++++++-- 3 files changed, 143 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9511d09852d2a0187c340…

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM*_CreateTexture.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 07d0804603d385b4a3d0d0b8f14137b9e38e7a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d0804603d385b4a3d0d0b8f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat May 21 02:55:41 2016 +0530 d3drm: Implement IDirect3DRM*_CreateTexture. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 47 ++++++++++++++++----- dlls/d3drm/tests/d3drm.c | 108 +++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 136 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07d0804603d385b4a3d0d…

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMTexture*_GetImage.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: c4aaf35d2bc1020e0aa2845ab8d2e7780892b013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4aaf35d2bc1020e0aa2845ab… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat May 21 02:55:42 2016 +0530 d3drm: Implement IDirect3DRMTexture*_GetImage. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 20 ++++++++++---------- dlls/d3drm/texture.c | 6 ++++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1123cd2..f279314 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1884,8 +1884,8 @@ static void test_Texture(void) ok(!strcmp(cname, "test"), "Expected cname to be \"test\", but got \"%s\"\n", cname); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); size = sizeof(cname); hr = IDirect3DRMTexture_GetClassName(texture1, &size, cname); @@ -1908,8 +1908,8 @@ static void test_Texture(void) d3drm_img = NULL; d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); size = sizeof(cname); hr = IDirect3DRMTexture2_GetClassName(texture2, &size, cname); @@ -1932,8 +1932,8 @@ static void test_Texture(void) d3drm_img = NULL; d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); size = sizeof(cname); hr = IDirect3DRMTexture3_GetClassName(texture3, &size, cname); @@ -2053,8 +2053,8 @@ static void test_Texture(void) IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); IDirect3DRMTexture2_Release(texture2); ref2 = get_refcount((IUnknown *)d3drm1); ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); @@ -2078,8 +2078,8 @@ static void test_Texture(void) IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - todo_wine ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get image.\n"); + ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); IDirect3DRMTexture3_Release(texture3); ref2 = get_refcount((IUnknown *)d3drm1); ok(ref2 == ref1, "expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", ref1, ref2); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 873d727..c2bbdb5 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -924,9 +924,11 @@ static HRESULT WINAPI d3drm_texture3_GetDecalOrigin(IDirect3DRMTexture3 *iface, static D3DRMIMAGE * WINAPI d3drm_texture3_GetImage(IDirect3DRMTexture3 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + + TRACE("iface %p.\n", iface); - return NULL; + return texture->image; } static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface)

1 0

Józef Kucia : wined3d: Match position output register by sysval semantic value.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: e36a7e5da441be201ceb3b576999198998ad5b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36a7e5da441be201ceb3b576… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:30 2016 +0200 wined3d: Match position output register by sysval semantic value. 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/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c345d67..8c22468 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5053,7 +5053,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (args->vp_mode == vertexshader) { - if (input->sysval_semantic == WINED3D_SV_POSITION) + if (input->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); else if (args->pointsprite && shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) @@ -5392,7 +5392,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, semantic_idx = output->semantic_idx; shader_glsl_write_mask_to_str(output->mask, reg_mask); - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_POSITION) && !semantic_idx) + if (output->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) { shader_addline(buffer, "gl_Position%s = vs_out[%u]%s;\n", reg_mask, output->register_idx, reg_mask); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 01c5d50..bcaee1c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -256,7 +256,7 @@ static void shader_dump_src_param(struct wined3d_string_buffer *buffer, const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) { - if (handler_idx >= sizeof(shader_opcode_names) / sizeof(*shader_opcode_names)) + if (handler_idx >= ARRAY_SIZE(shader_opcode_names)) return wine_dbg_sprintf("UNRECOGNIZED(%#x)", handler_idx); return shader_opcode_names[handler_idx]; @@ -264,7 +264,7 @@ const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HA static const char *shader_semantic_name_from_usage(enum wined3d_decl_usage usage) { - if (usage >= sizeof(semantic_names) / sizeof(*semantic_names)) + if (usage >= ARRAY_SIZE(semantic_names)) { FIXME("Unrecognized usage %#x.\n", usage); return "UNRECOGNIZED"; @@ -277,14 +277,26 @@ static enum wined3d_decl_usage shader_usage_from_semantic_name(const char *name) { unsigned int i; - for (i = 0; i < sizeof(semantic_names) / sizeof(*semantic_names); ++i) + for (i = 0; i < ARRAY_SIZE(semantic_names); ++i) { - if (!strcmp(name, semantic_names[i])) return i; + if (!strcmp(name, semantic_names[i])) + return i; } return ~0U; } +static enum wined3d_sysval_semantic shader_sysval_semantic_from_usage(enum wined3d_decl_usage usage) +{ + switch (usage) + { + case WINED3D_DECL_USAGE_POSITION: + return WINED3D_SV_POSITION; + default: + return 0; + } +} + BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) { return !strcmp(semantic_name, shader_semantic_name_from_usage(usage)); @@ -295,7 +307,7 @@ static void shader_signature_from_semantic(struct wined3d_shader_signature_eleme { e->semantic_name = shader_semantic_name_from_usage(s->usage); e->semantic_idx = s->usage_idx; - e->sysval_semantic = 0; + e->sysval_semantic = shader_sysval_semantic_from_usage(s->usage); e->component_type = 0; e->register_idx = s->reg.reg.idx[0].offset; e->mask = s->reg.write_mask; @@ -306,7 +318,7 @@ static void shader_signature_from_usage(struct wined3d_shader_signature_element { e->semantic_name = shader_semantic_name_from_usage(usage); e->semantic_idx = usage_idx; - e->sysval_semantic = 0; + e->sysval_semantic = shader_sysval_semantic_from_usage(usage); e->component_type = 0; e->register_idx = reg_idx; e->mask = write_mask;

1 0

Henri Verbeet : kernel32/nls: Store LOCALE_SNATIVEDIGITS as UTF-8 in far.nls.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 39fdd439b3f013ca127c332bfd5268b359f47607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fdd439b3f013ca127c332bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:44 2016 +0200 kernel32/nls: Store LOCALE_SNATIVEDIGITS as UTF-8 in far.nls. CP1256 can't represent these, but it's fine in UTF-8. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 652c78f..631f93b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -126,7 +126,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SNAME "fa-IR" LOCALE_SNATIVECTRYNAME "ایران" LOCALE_SNATIVECURRNAME "ریال" - LOCALE_SNATIVEDIGITS L"\x06f0\x06f1\x06f2\x06f3\x06f4\x06f5\x06f6\x06f7\x06f8\x06f9" + LOCALE_SNATIVEDIGITS "۰۱۲۳۴۵۶۷۸۹" LOCALE_SNATIVEDISPLAYNAME "فارسی (ایران)" LOCALE_SNATIVELANGNAME "فارسی" LOCALE_SNEGATIVESIGN "-"

1 0

Henri Verbeet : kernel32/nls: Use Persian punctuation for LANG_PERSIAN.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 53643d3b6030c74a88d1c2bd4d1fe7b6cfe48ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53643d3b6030c74a88d1c2bd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:45 2016 +0200 kernel32/nls: Use Persian punctuation for LANG_PERSIAN. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 631f93b..114088b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -96,7 +96,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME5 "جمعه" LOCALE_SDAYNAME6 "شنبه" LOCALE_SDAYNAME7 "یک‌شنبه" - LOCALE_SDECIMAL "." + LOCALE_SDECIMAL "٫" LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial" LOCALE_SENGLANGUAGE "Persian" @@ -105,9 +105,9 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SISO3166CTRYNAME "IR" LOCALE_SISO639LANGNAME "fa" LOCALE_SLANGUAGE "Persian (Iran)" - LOCALE_SLIST ";" + LOCALE_SLIST "؛" LOCALE_SLONGDATE "yyyy/MM/dd" - LOCALE_SMONDECIMALSEP "/" + LOCALE_SMONDECIMALSEP "٫" LOCALE_SMONGROUPING "3;0" LOCALE_SMONTHNAME1 "ژانویه" LOCALE_SMONTHNAME2 "فوریه" @@ -122,7 +122,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SMONTHNAME11 "نوامبر" LOCALE_SMONTHNAME12 "دسامبر" LOCALE_SMONTHNAME13 "" - LOCALE_SMONTHOUSANDSEP "," + LOCALE_SMONTHOUSANDSEP "٬" LOCALE_SNAME "fa-IR" LOCALE_SNATIVECTRYNAME "ایران" LOCALE_SNATIVECURRNAME "ریال" @@ -143,7 +143,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_SSHORTESTDAYNAME7 "ی" LOCALE_SSHORTTIME "hh:mm tt" LOCALE_SSORTNAME "Default" - LOCALE_STHOUSAND "," + LOCALE_STHOUSAND "٬" LOCALE_STIME ":" LOCALE_STIMEFORMAT "hh:mm:ss tt" LOCALE_SYEARMONTH "yyyy/MM"

1 0

Henri Verbeet : kernel32/nls: Fix LOCALE_IFIRSTDAYOFWEEK for LANG_PERSIAN.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 918089eedf1944a625742b033c3c312a5a4d1ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=918089eedf1944a625742b033… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:46 2016 +0200 kernel32/nls: Fix LOCALE_IFIRSTDAYOFWEEK for LANG_PERSIAN. The first day of the week is شنبه, not یک‌شنبه. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 114088b..cd1d0d8 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -39,7 +39,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTUNIXCODEPAGE "65001" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" - LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0429"

1 0